diff --git a/pom.xml b/pom.xml
index 2d7977d84..c3637feed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
+<<<<<<< HEAD
 	<version>1.0.16</version>
+=======
+	<version>1.0.15</version>
+>>>>>>> 1448d3b4014cd0df67f5c79033d6adf38599b584
 	
 	<distributionManagement>
         <repository>