diff --git a/pom.xml b/pom.xml
index 539316d..01d8638 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.devnull</groupId>
     <artifactId>zuul-parent</artifactId>
+<<<<<<< HEAD
     <version>1.6-SNAPSHOT</version>
+=======
+    <version>1.6.0</version>
+>>>>>>> parent of 858cd34... [maven-release-plugin] prepare for next development iteration
     <packaging>pom</packaging>
     <name>Zuul: Parent POM</name>
     <url>https://github.com/psmith/Zuul</url>
diff --git a/zuul-data/pom.xml b/zuul-data/pom.xml
index d813367..996ee86 100644
--- a/zuul-data/pom.xml
+++ b/zuul-data/pom.xml
@@ -7,7 +7,11 @@
     <parent>
         <groupId>org.devnull</groupId>
         <artifactId>zuul-parent</artifactId>
+<<<<<<< HEAD
         <version>1.6-SNAPSHOT</version>
+=======
+        <version>1.6.0</version>
+>>>>>>> parent of 858cd34... [maven-release-plugin] prepare for next development iteration
     </parent>
     <dependencies>
         <!-- DevNull -->
diff --git a/zuul-web/pom.xml b/zuul-web/pom.xml
index 0471ee4..7fc542e 100644
--- a/zuul-web/pom.xml
+++ b/zuul-web/pom.xml
@@ -8,7 +8,11 @@
     <parent>
         <groupId>org.devnull</groupId>
         <artifactId>zuul-parent</artifactId>
+<<<<<<< HEAD
         <version>1.6-SNAPSHOT</version>
+=======
+        <version>1.6.0</version>
+>>>>>>> parent of 858cd34... [maven-release-plugin] prepare for next development iteration
     </parent>
 
     <dependencies>