diff --git a/pom.xml b/pom.xml
index 1fdf6565b..95277bc4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,11 +23,7 @@
         <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
         <spring.tuple.version>1.0.0.RELEASE</spring.tuple.version>
         <spring.integration.tuple.version>1.0.0.RELEASE</spring.integration.tuple.version>
-<<<<<<< 57d3ba33176c3f792c733850bf6e4f99ec6af24a
         <reactor.version>Bismuth-RELEASE</reactor.version>
-=======
-        <reactor.version>Bismuth-M3</reactor.version>
->>>>>>> Minor fixes
         <kryo-shaded.version>3.0.3</kryo-shaded.version>
         <objenesis.version>2.1</objenesis.version>
     </properties>
@@ -43,11 +39,6 @@
                 <artifactId>spring-cloud-stream-tools</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-stream-codec</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-stream-rxjava</artifactId>
diff --git a/spring-cloud-stream-core-docs/pom.xml b/spring-cloud-stream-core-docs/pom.xml
index fbff70c4e..8e0a1512b 100644
--- a/spring-cloud-stream-core-docs/pom.xml
+++ b/spring-cloud-stream-core-docs/pom.xml
@@ -17,10 +17,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-codec</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-rxjava</artifactId>
diff --git a/spring-cloud-stream-tools/pom.xml b/spring-cloud-stream-tools/pom.xml
index 2945beecd..3fad12e5e 100644
--- a/spring-cloud-stream-tools/pom.xml
+++ b/spring-cloud-stream-tools/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-build</artifactId>
-        <version>2.0.0.BUILD-SNAPSHOT</version>
+        <version>2.0.0.M2</version>
         <relativePath />
     </parent>
 
diff --git a/spring-cloud-stream/pom.xml b/spring-cloud-stream/pom.xml
index e634af7e8..e9c54649d 100644
--- a/spring-cloud-stream/pom.xml
+++ b/spring-cloud-stream/pom.xml
@@ -33,18 +33,12 @@
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
-<<<<<<< 57d3ba33176c3f792c733850bf6e4f99ec6af24a
-=======
 			<version>5.0.0.BUILD-SNAPSHOT</version>
->>>>>>> Minor fixes
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-jmx</artifactId>
-<<<<<<< 57d3ba33176c3f792c733850bf6e4f99ec6af24a
-=======
 			<version>5.0.0.BUILD-SNAPSHOT</version>
->>>>>>> Minor fixes
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/aggregation/AggregationTest.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/aggregation/AggregationTest.java
index cd95ba1a5..18c6cb39f 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/aggregation/AggregationTest.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/aggregation/AggregationTest.java
@@ -254,7 +254,7 @@ public class AggregationTest {
 		assertTrue(Arrays.equals(
 				((SourceConfigurer) aggregateApplicationBuilderAccessor.getPropertyValue("sourceConfigurer"))
 						.getArgs(),
-				new String[] { "--fooValue=bara" }));
+				new String[] { "--fooValue=bara", "--foo-value=bara" }));
 		final List<AggregateApplicationBuilder.ProcessorConfigurer> processorConfigurers =
 				(List<AggregateApplicationBuilder.ProcessorConfigurer>) aggregateApplicationBuilderAccessor
 				.getPropertyValue("processorConfigurers");