diff --git a/pom.xml b/pom.xml
index 25f5bb1bba2..fbf105bbae3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1169,7 +1169,6 @@
         <module>web-ui-docs</module>
         <module>web</module>
         <module>e2e-tests</module>
-        <module>geoserver</module>
       </modules>
     </profile>
     <profile>
diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml
index 5b507373cef..09fbf37a4d0 100644
--- a/schemas-test/pom.xml
+++ b/schemas-test/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<< HEAD
 <!--
   ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
   ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)