diff --git a/samples/standalone/yml/http-client/pom.xml b/samples/standalone/yml/http-client/pom.xml
index 0da01ca73e..ffc6a2a095 100644
--- a/samples/standalone/yml/http-client/pom.xml
+++ b/samples/standalone/yml/http-client/pom.xml
@@ -7,8 +7,8 @@
 	<artifactId>http-client-yml</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
-	<name>Spring Cloud Contract Verifier Http Client Sample</name>
-	<description>Spring Cloud Contract Verifier Http Client Sample</description>
+	<name>Spring Cloud Contract Verifier Http Client YAML Sample</name>
+	<description>Spring Cloud Contract Verifier Http Client YAML Sample</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
diff --git a/samples/standalone/yml/http-server/gradle.properties b/samples/standalone/yml/http-server/gradle.properties
index 4aa503e80a..53bec6cd54 100644
--- a/samples/standalone/yml/http-server/gradle.properties
+++ b/samples/standalone/yml/http-server/gradle.properties
@@ -1,3 +1,8 @@
 org.gradle.daemon=false
+<<<<<<< HEAD
 verifierVersion=2.0.0.BUILD-SNAPSHOT
 BOM_VERSION=Finchley.BUILD-SNAPSHOT
+=======
+verifierVersion=1.2.3.BUILD-SNAPSHOT
+BOM_VERSION=Edgware.BUILD-SNAPSHOT
+>>>>>>> 1.2.x
diff --git a/samples/standalone/yml/http-server/pom.xml b/samples/standalone/yml/http-server/pom.xml
index 8f22f31234..a04f512924 100644
--- a/samples/standalone/yml/http-server/pom.xml
+++ b/samples/standalone/yml/http-server/pom.xml
@@ -7,8 +7,8 @@
 	<artifactId>http-server-yml</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
-	<name>Spring Cloud Contract Verifier Http Server Sample</name>
-	<description>Spring Cloud Contract Verifier Http Server Sample</description>
+	<name>Spring Cloud Contract Verifier Http Server YAML Sample</name>
+	<description>Spring Cloud Contract Verifier Http Server YAML Sample</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -20,8 +20,13 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
+<<<<<<< HEAD
 		<spring-cloud-contract.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 		<spring-cloud-dependencies.version>Finchley.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
+=======
+		<spring-cloud-contract.version>1.2.3.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
+>>>>>>> 1.2.x
 	</properties>
 
 	<dependencies>