diff --git a/pom.xml b/pom.xml
index ee4b6ff4109..de54d162441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2195,11 +2195,7 @@
         <!-- app management related versions -->
         <googlecode.plist.version>1.8</googlecode.plist.version>
         <net.dongliu.version>2.4.2</net.dongliu.version>
-
-<<<<<<< HEAD
-
-=======
->>>>>>> 625589decc78a4f3da8091a227c0fac6e2617c9e
+        
         <!--websocket related lib versions-->
         <tomcat.websocket.version>7.0.85</tomcat.websocket.version>
         <javax.websocket.version>1.0</javax.websocket.version>