diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 8e4564b0a..e382ff044 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -17,7 +17,11 @@
 	<name>Benchmarks</name>
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
+<<<<<<< HEAD
 	<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+	<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 	<artifactId>benchmarks</artifactId>
 
 	<properties>
diff --git a/docs/pom.xml b/docs/pom.xml
index 2642b928a..fa62e913a 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 	</parent>
 	<artifactId>spring-cloud-sleuth-docs</artifactId>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 84483e180..1740e9b43 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -9,7 +9,11 @@
         <relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-dependencies</artifactId>
+<<<<<<< HEAD
 	<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+	<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 	<packaging>pom</packaging>
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 60477744f..637281c06 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -12,7 +12,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
index 62d0a3d70..fd6927062 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
@@ -20,7 +20,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
index 5380ce6be..13de2d2f6 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
@@ -28,7 +28,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
index 13e63c2bc..88ed6d1fe 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
@@ -28,7 +28,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/pom.xml
index f507b6916..c64e8c3ed 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/pom.xml
@@ -28,7 +28,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
index 1720e7335..438f339b0 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
@@ -28,7 +28,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
index fbaad4d24..18f7631b2 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
@@ -28,7 +28,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
index 8e47c1773..9ddfed868 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
@@ -27,7 +27,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
index cb1e19950..0b4dfd97e 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
@@ -28,7 +28,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml
index 9a00b34ff..28343e3d5 100644
--- a/spring-cloud-starter-zipkin/pom.xml
+++ b/spring-cloud-starter-zipkin/pom.xml
@@ -5,7 +5,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
+<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
+=======
+		<version>1.2.5.BUILD-SNAPSHOT</version>
+>>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-zipkin</artifactId>