diff --git a/cat-home/pom.xml b/cat-home/pom.xml
index 80de32c8a3a341130874b6d99f8ec90ad3bbc22a..b3fc0a289ef1ac9b85d9116fc55ac43fcb972831 100755
--- a/cat-home/pom.xml
+++ b/cat-home/pom.xml
@@ -161,12 +161,8 @@
 								${basedir}/src/main/resources/META-INF/dal/model/monitor-rules-manifest.xml,
 								${basedir}/src/main/resources/META-INF/dal/model/alertconfig-manifest.xml,
 								${basedir}/src/main/resources/META-INF/dal/model/alertsummary-manifest.xml,
-<<<<<<< HEAD
 								${basedir}/src/main/resources/META-INF/dal/model/thirdParty-manifest.xml,
                             </manifest>
-=======
-							</manifest>
->>>>>>> 3e3e41e0b99c7f6ccbc47eee11d96e67a9ff45fd
 						</configuration>
 					</execution>
 					<execution>