diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml
index 0de1a5ae86..0129e6665b 100644
--- a/samples/standalone/dsl/pom.xml
+++ b/samples/standalone/dsl/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples-standalone</artifactId>
-<<<<<<< HEAD
 		<version>4.0.0-SNAPSHOT</version>
-=======
-		<version>3.1.4-SNAPSHOT</version>
->>>>>>> 3.1.x
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -23,11 +19,7 @@
 	</description>
 
 	<properties>
-<<<<<<< HEAD
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
-=======
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
->>>>>>> 3.1.x
 	</properties>
 
 	<modules>