diff --git a/pom.xml b/pom.xml
index e1a3385..4725e5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,11 @@
 
     <groupId>org.kairosdb</groupId>
     <artifactId>kairos-influx</artifactId>
+<<<<<<< HEAD
     <version>1.1-SNAPSHOT</version>
+=======
+    <version>1.1</version>
+>>>>>>> master
 
     <dependencies>
         <dependency>