diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
index 3fbb16c0..df95d691 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
@@ -23,11 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>kubernetes-circuitbreaker-ribbon-example</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<artifactId>greeting-service</artifactId>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
index e66ac2c3..63174f13 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
@@ -23,11 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
index 71dc5c17..90d0a6cc 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
@@ -5,11 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
index 6d30a03f..96457680 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,11 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
index 2549b7c5..d71a05ca 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
@@ -22,11 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
index 594faf34..301f0561 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
@@ -22,11 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
index 54a027af..ea9d5401 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<artifactId>discovery-client</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
index 9b5e4d8a..8efe51b2 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<artifactId>discovery-service-a</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
index ee233163..5ba81c79 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<artifactId>discovery-service-b</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/pom.xml
index f40b46c7..f9b4c725 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Discovery Parent</name>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
index 887a4afa..4ca5d0d0 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<artifactId>tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
index df23f7d3..a6d7ba5d 100644
--- a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Configmap</name>
diff --git a/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
index 7982dd0d..d5de7362 100644
--- a/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-<<<<<<< HEAD
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.0.4.BUILD-SNAPSHOT</version>
->>>>>>> 1.0.x
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Core</name>