diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 745a352d09..84acd665a1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,13 +19,8 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-<<<<<<< HEAD
         distribution: 'temurin'
         java-version: 17
-=======
-        distribution: 'temurin' # See 'Supported distributions' for available options
-        java-version: 8
->>>>>>> 3.1.x
     - name: Cache local Maven repository
       uses: actions/cache@v3
       with:
diff --git a/docs/src/main/asciidoc/_attributes.adoc b/docs/src/main/asciidoc/_attributes.adoc
index c44564efa1..ca6be0ccb8 100644
--- a/docs/src/main/asciidoc/_attributes.adoc
+++ b/docs/src/main/asciidoc/_attributes.adoc
@@ -30,7 +30,7 @@
 :standalone_pact_path: {samples_path}/standalone/dsl
 :standalone_restdocs_path: {samples_path}/standalone/restdocs
 :tests_path: {core_path}/tests
-:samples_branch: 3.1.x
+:samples_branch: main
 :samples_url: https://raw.githubusercontent.com/spring-cloud-samples/spring-cloud-contract-samples/{samples_branch}
 :samples_code: https://github.com/spring-cloud-samples/spring-cloud-contract-samples/tree/{samples_branch}/
 :doc_samples: {samples_code}/wiremock-for-contract-docs
diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml
index cb808074b9..e8cbde9626 100644
--- a/samples/standalone/contracts/com/example/server/pom.xml
+++ b/samples/standalone/contracts/com/example/server/pom.xml
@@ -20,15 +20,9 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
 		<java.version>17</java.version>
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 		<spring-cloud-release.version>2022.0.0-SNAPSHOT</spring-cloud-release.version>
-=======
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-release.version>2021.0.3-SNAPSHOT</spring-cloud-release.version>
->>>>>>> 3.1.x
 		<excludeBuildFolders>true</excludeBuildFolders>
 	</properties>