diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml
index 61b9ab7f8..fb79aec29 100644
--- a/spring-cloud-function-context/pom.xml
+++ b/spring-cloud-function-context/pom.xml
@@ -46,8 +46,6 @@
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-kotlin</artifactId>
 			<optional>true</optional>
-<<<<<<< HEAD
-=======
 		</dependency>
 		<dependency> 
 			<groupId>javax.annotation</groupId>
@@ -58,7 +56,6 @@
 		    <groupId>javax.activation</groupId>
 		    <artifactId>javax.activation-api</artifactId>
 		    <version>1.2.0</version>
->>>>>>> 4.x
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml
index 55f22acef..ab4488ff9 100644
--- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml
@@ -24,11 +24,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 		<aws-lambda-events.version>3.9.0</aws-lambda-events.version>
-<<<<<<< HEAD
-		<spring-cloud-function.version>3.2.2-SNAPSHOT</spring-cloud-function.version>
-=======
 		<spring-cloud-function.version>4.0.0-SNAPSHOT</spring-cloud-function.version>
->>>>>>> 4.x
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
index 98eff2eed..0db7d4a4a 100644
--- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
@@ -32,19 +32,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-<<<<<<< HEAD
-=======
 		</dependency>
 		<dependency>
 		    <groupId>jakarta.servlet</groupId>
 		    <artifactId>jakarta.servlet-api</artifactId>
 		    <scope>provided</scope>
->>>>>>> 4.x
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.springframework</groupId> -->
-<!-- 			<artifactId>spring-web</artifactId> -->
-<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java
index 28e3a65c6..e7c39fcbd 100644
--- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java
+++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java
@@ -32,6 +32,7 @@ import org.springframework.cloud.function.context.FunctionalSpringApplication;
 import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.ResolvableType;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.SocketUtils;
@@ -137,9 +138,10 @@ public class FunctionEndpointInitializerTests {
 
 		@Override
 		public void initialize(GenericApplicationContext applicationContext) {
+
 			applicationContext.registerBean("consume", FunctionRegistration.class,
 					() -> new FunctionRegistration<>(consume())
-						.type(FunctionType.consumer(String.class)));
+						.type(ResolvableType.forClassWithGenerics(Consumer.class, String.class).getType()));
 		}
 
 	}