diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml
index fd153fb7d48..38fa43403a3 100644
--- a/modules/openapi-generator-cli/pom.xml
+++ b/modules/openapi-generator-cli/pom.xml
@@ -4,11 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
         <version>5.0.0-SNAPSHOT</version>
-=======
-        <version>4.3.1-SNAPSHOT</version>
->>>>>>> origin/master
         <!-- /RELEASE_VERSION -->
         <relativePath>../..</relativePath>
     </parent>
diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml
index c211a6a314c..dc45dda9eea 100644
--- a/modules/openapi-generator-core/pom.xml
+++ b/modules/openapi-generator-core/pom.xml
@@ -6,11 +6,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <groupId>org.openapitools</groupId>
     <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
     <version>5.0.0-SNAPSHOT</version>
-=======
-    <version>4.3.1-SNAPSHOT</version>
->>>>>>> origin/master
     <!-- /RELEASE_VERSION -->
     <relativePath>../..</relativePath>
   </parent>
diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties
index fe32b950bb7..a9d1e68557c 100644
--- a/modules/openapi-generator-gradle-plugin/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/gradle.properties
@@ -1,9 +1,5 @@
 # RELEASE_VERSION
-<<<<<<< HEAD
 openApiGeneratorVersion=5.0.0-SNAPSHOT
-=======
-openApiGeneratorVersion=4.3.1-SNAPSHOT
->>>>>>> origin/master
 # /RELEASE_VERSION
 
 # BEGIN placeholders
diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index 331c6d8cd1a..50472a7859f 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -4,11 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
         <version>5.0.0-SNAPSHOT</version>
-=======
-        <version>4.3.1-SNAPSHOT</version>
->>>>>>> origin/master
         <!-- /RELEASE_VERSION -->
         <relativePath>../..</relativePath>
     </parent>
diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
index 5d43480197b..2c19b539cc5 100644
--- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
+++ b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
@@ -19,11 +19,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
                 <version>5.0.0-SNAPSHOT</version>
-=======
-                <version>4.3.1-SNAPSHOT</version>
->>>>>>> origin/master
                 <!-- /RELEASE_VERSION -->
                 <dependencies>
                     <dependency>
diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml
index 305f03977a0..2e41d33653c 100644
--- a/modules/openapi-generator-maven-plugin/pom.xml
+++ b/modules/openapi-generator-maven-plugin/pom.xml
@@ -5,11 +5,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
         <version>5.0.0-SNAPSHOT</version>
-=======
-        <version>4.3.1-SNAPSHOT</version>
->>>>>>> origin/master
         <!-- /RELEASE_VERSION -->
         <relativePath>../..</relativePath>
     </parent>
diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml
index 4ea043797aa..c158dd879f3 100644
--- a/modules/openapi-generator-online/pom.xml
+++ b/modules/openapi-generator-online/pom.xml
@@ -4,11 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
         <version>5.0.0-SNAPSHOT</version>
-=======
-        <version>4.3.1-SNAPSHOT</version>
->>>>>>> origin/master
         <!-- /RELEASE_VERSION -->
         <relativePath>../..</relativePath>
     </parent>
diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
index 69011ed7b15..0b646666815 100644
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -4,11 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-<<<<<<< HEAD
         <version>5.0.0-SNAPSHOT</version>
-=======
-        <version>4.3.1-SNAPSHOT</version>
->>>>>>> origin/master
         <!-- /RELEASE_VERSION -->
         <relativePath>../..</relativePath>
     </parent>
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
index c8ccee7fd3e..8b09b893e2e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -783,12 +783,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                     continue;
                 }
 
-<<<<<<< HEAD
-                File targetedFile = new File(outputFilename);
-                if (ignoreProcessor.allowsFile(targetedFile)) {
-                    if (targetedFile.exists() && !support.canOverwrite) {
-                        LOGGER.info("Skipped overwriting " + support.destinationFilename + " as the file already exists.");
-=======
                 if (ignoreProcessor.allowsFile(new File(outputFilename))) {
                     // support.templateFile is the unmodified/original supporting file name (e.g. build.sh.mustache)
                     // templatingEngine.templateExists dispatches resolution to this, performing template-engine specific inspect of support file extensions.
@@ -800,7 +794,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         if (config.isEnablePostProcessFile()) {
                             config.postProcessFile(written, "supporting-mustache");
                         }
->>>>>>> origin/master
                     } else {
                         if (Arrays.stream(templatingEngine.getFileExtensions()).anyMatch(templateFile::endsWith)) {
                             String templateContent = templatingEngine.compileTemplate(this, bundle, support.templateFile);
@@ -813,7 +806,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         } else {
                             InputStream in = null;
 
-<<<<<<< HEAD
                             try {
                                 in = new FileInputStream(templateFile);
                             } catch (Exception e) {
@@ -827,20 +819,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                             if (config.isEnablePostProcessFile()) {
                                 config.postProcessFile(outputFile, "supporting-common");
                             }
-=======
-                        try {
-                            in = new FileInputStream(templateFile);
-                        } catch (Exception e) {
-                            // continue
-                        }
-                        if (in == null) {
-                            in = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(templateFile));
-                        }
-                        File outputFile = writeInputStreamToFile(outputFilename, in, templateFile);
-                        files.add(outputFile);
-                        if (config.isEnablePostProcessFile() && !dryRun) {
-                            config.postProcessFile(outputFile, "supporting-common");
->>>>>>> origin/master
                         }
                     }