diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties
index 67caca57dd0..aa47d751bc5 100644
--- a/modules/openapi-generator-gradle-plugin/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/gradle.properties
@@ -1,10 +1,5 @@
 # RELEASE_VERSION
-<<<<<<< HEAD
 openApiGeneratorVersion=6.0.0-SNAPSHOT
-=======
-openApiGeneratorVersion=5.1.0-SNAPSHOT
->>>>>>> origin/master
->>>>>>> origin/5.1.x
 # /RELEASE_VERSION
 
 # BEGIN placeholders
diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml
index 68255cb736f..d7c733c85c6 100644
--- a/modules/openapi-generator-maven-plugin/examples/java-client.xml
+++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml
@@ -13,11 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
                 <version>6.0.0-SNAPSHOT</version>
-=======
-                <version>5.1.0-SNAPSHOT</version>
->>>>>>> origin/5.1.x
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
index 25b7c1144f7..9c99f1d674e 100644
--- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
@@ -13,11 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
                 <version>6.0.0-SNAPSHOT</version>
-=======
-                <version>5.1.0-SNAPSHOT</version>
->>>>>>> origin/5.1.x
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator-maven-plugin/examples/non-java.xml b/modules/openapi-generator-maven-plugin/examples/non-java.xml
index 022c455cb08..6af688a0032 100644
--- a/modules/openapi-generator-maven-plugin/examples/non-java.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java.xml
@@ -13,11 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
                 <version>6.0.0-SNAPSHOT</version>
-=======
-                <version>5.1.0-SNAPSHOT</version>
->>>>>>> origin/5.1.x
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>