diff --git a/pom.xml b/pom.xml
index c8b4c768f..7aeabee1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-parent</artifactId>
-<<<<<<< HEAD
-	<version>3.2.2-SNAPSHOT</version>
-=======
 	<version>4.0.0-SNAPSHOT</version>
->>>>>>> 4.x
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>