diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java
index 92f2479b2..78948dcaa 100644
--- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java
+++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java
@@ -39,7 +39,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ErrorBindingTests {
 
 	@Test
+<<<<<<< HEAD
 	void testConfigurationWithDefaultErrorHandler() {
+=======
+	public void testConfigurationWithDefaultErrorHandler() {
+>>>>>>> 3a7ab48d5... Fix ErrorBindingTests
 		ApplicationContext context = new SpringApplicationBuilder(
 				TestChannelBinderConfiguration.getCompleteConfiguration(
 						ErrorBindingTests.ErrorConfigurationDefault.class))
@@ -95,10 +99,10 @@ public class ErrorBindingTests {
 		private int counter;
 
 		@Bean
-		public Consumer<Object> handle() {
+		public Function<String, String> handle() {
 			return v -> {
 				this.counter++;
-				throw new RuntimeException("BOOM!");
+				throw new RuntimeException("Intentional");
 			};
 		}
 
@@ -116,11 +120,10 @@ public class ErrorBindingTests {
 
 		private int counter;
 
-		@Bean
-		public Consumer<Object> handle() {
+		public Function<String, String> handle() {
 			return v -> {
 				this.counter++;
-				throw new RuntimeException("BOOM!");
+				throw new RuntimeException("Intentional");
 			};
 		}