diff --git a/pom.xml b/pom.xml
index 1f8c54d5dfa..5bbe946fc38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1436,7 +1436,6 @@
         <alpn.version>8.1.9.v20160720</alpn.version>
       </properties>
     </profile>
-<<<<<<< HEAD
     <profile>
       <id>8u111</id>
       <activation>