diff --git a/pom.xml b/pom.xml
index cf52ba2..7f373bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,7 @@
   <groupId>org.bsc.maven</groupId>
   <artifactId>maven-processor-plugin-parent</artifactId>
   <packaging>pom</packaging>
-<<<<<<< HEAD
-  <version>4.0-SNAPSHOT</version>
-=======
   <version>4.0</version>
->>>>>>> release/4.0
   <name>MAVEN PROCESSOR PLUGIN PARENT</name>
   <description>A maven plugin to process annotation for jdk6 at compile time
 
diff --git a/processor/pom.xml b/processor/pom.xml
index 6e3e0e6..39a7b82 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -13,11 +13,7 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
   <parent>
       <groupId>org.bsc.maven</groupId>
       <artifactId>maven-processor-plugin-parent</artifactId>
-<<<<<<< HEAD
-      <version>4.0-SNAPSHOT</version>
-=======
       <version>4.0</version>
->>>>>>> release/4.0
   </parent>
 
   <properties>
diff --git a/utils/pom.xml b/utils/pom.xml
index e71ac04..1ee5c15 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -31,11 +31,7 @@
     <parent>
         <groupId>org.bsc.maven</groupId>
         <artifactId>maven-processor-plugin-parent</artifactId>
-<<<<<<< HEAD
-        <version>4.0-SNAPSHOT</version>
-=======
         <version>4.0</version>
->>>>>>> release/4.0
     </parent>
 
     <properties>