diff --git a/pom.xml b/pom.xml
index 1e2dd77..f8733b8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -39,11 +39,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>demoiselle-framework-build</artifactId>
-<<<<<<< HEAD
 	<version>2.4.0-ALPHA1-SNAPSHOT</version>
-=======
-	<version>2.3.2-SNAPSHOT</version>
->>>>>>> master
 	<packaging>pom</packaging>
 
 	<parent>
--
libgit2 0.21.2