diff --git a/pom.xml b/pom.xml
index ef760b81d..2dafd24fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,6 @@
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
   <version>1.2.0</version>
->>>>>>> a4a96e4a (fix: issue in previous merge)
   <packaging>pom</packaging>
   <name>WIA APP ${project.version} </name>