diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml
index a66576dd6ac..41d48295c07 100644
--- a/modules/openapi-generator-cli/pom.xml
+++ b/modules/openapi-generator-cli/pom.xml
@@ -3,11 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml
index 9a95abaf02f..e63b7dac541 100644
--- a/modules/openapi-generator-core/pom.xml
+++ b/modules/openapi-generator-core/pom.xml
@@ -5,11 +5,7 @@
   <parent>
     <artifactId>openapi-generator-project</artifactId>
     <groupId>org.openapitools</groupId>
-<<<<<<< HEAD
     <version>4.1.0-SNAPSHOT</version>
-=======
-    <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties
index 9be07976296..b545d45715d 100644
--- a/modules/openapi-generator-gradle-plugin/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/gradle.properties
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 openApiGeneratorVersion=4.1.0-SNAPSHOT
-=======
-openApiGeneratorVersion=4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 # BEGIN placeholders
 # these are just placeholders to allow contributors to build directly
diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index d08fdb3c19e..b1ff916d852 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -3,11 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml
index d657464febc..0ec7803e887 100644
--- a/modules/openapi-generator-maven-plugin/pom.xml
+++ b/modules/openapi-generator-maven-plugin/pom.xml
@@ -4,11 +4,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>openapi-generator-maven-plugin</artifactId>
diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml
index ea14a7fea02..79e1ccfa07d 100644
--- a/modules/openapi-generator-online/pom.xml
+++ b/modules/openapi-generator-online/pom.xml
@@ -3,11 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>openapi-generator-online</artifactId>
diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
index fe92a91688d..53fc6efe312 100644
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -3,11 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -317,11 +313,7 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>openapi-generator-core</artifactId>
-<<<<<<< HEAD
             <version>4.1.0-SNAPSHOT</version>
-=======
-            <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         </dependency>
     </dependencies>
     <repositories>
diff --git a/pom.xml b/pom.xml
index 46100dd9ea3..83746b1d065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <packaging>pom</packaging>
     <name>openapi-generator-project</name>
-<<<<<<< HEAD
     <version>4.1.0-SNAPSHOT</version>
-=======
-    <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
     <url>https://github.com/openapitools/openapi-generator</url>
     <scm>
         <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
diff --git a/samples/client/petstore/R/.openapi-generator/VERSION b/samples/client/petstore/R/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/R/.openapi-generator/VERSION
+++ b/samples/client/petstore/R/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/apex/.openapi-generator/VERSION b/samples/client/petstore/apex/.openapi-generator/VERSION
index d96260ba335..83a328a9227 100644
--- a/samples/client/petstore/apex/.openapi-generator/VERSION
+++ b/samples/client/petstore/apex/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.2-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
index d96260ba335..83a328a9227 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.2-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/elixir/.openapi-generator/VERSION b/samples/client/petstore/elixir/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/elixir/.openapi-generator/VERSION
+++ b/samples/client/petstore/elixir/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION
+++ b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/groovy/.openapi-generator/VERSION b/samples/client/petstore/groovy/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/groovy/.openapi-generator/VERSION
+++ b/samples/client/petstore/groovy/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/feign/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign10x/.openapi-generator/VERSION b/samples/client/petstore/java/feign10x/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/feign10x/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/feign10x/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise/src/ApiClient.js b/samples/client/petstore/javascript-promise/src/ApiClient.js
index 358cf4859a9..d925f12d588 100644
--- a/samples/client/petstore/javascript-promise/src/ApiClient.js
+++ b/samples/client/petstore/javascript-promise/src/ApiClient.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
index 5861c38500a..378918f435d 100644
--- a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/FakeApi.js b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
index a51252544e0..bccf87b9f33 100644
--- a/samples/client/petstore/javascript-promise/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
index 26ae3232931..382507fb3f2 100644
--- a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/PetApi.js b/samples/client/petstore/javascript-promise/src/api/PetApi.js
index 33c0809e8be..268dc614e3e 100644
--- a/samples/client/petstore/javascript-promise/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/PetApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/StoreApi.js b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
index 1edc756ffbc..afc4eae0b59 100644
--- a/samples/client/petstore/javascript-promise/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/UserApi.js b/samples/client/petstore/javascript-promise/src/api/UserApi.js
index ac275781ad9..e41446e5e17 100644
--- a/samples/client/petstore/javascript-promise/src/api/UserApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/UserApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/index.js b/samples/client/petstore/javascript-promise/src/index.js
index f7028db83eb..d172e7c3e00 100644
--- a/samples/client/petstore/javascript-promise/src/index.js
+++ b/samples/client/petstore/javascript-promise/src/index.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js
index 267f3041d08..73b58a733b1 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js
index f1d4f890be7..3a1f4ecc9d8 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js
index 309dc0f315d..5306f6bd01d 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
index 638b611596d..bd62237ca20 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js
index 717be11a92f..8f678419e25 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js
index 04a967d133f..651c8894aa8 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js
index 3e5e7a80423..b5180bbe828 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js
index 1cf681db0dc..9181dac6014 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Animal.js b/samples/client/petstore/javascript-promise/src/model/Animal.js
index b10270da2fa..4477ebc5a97 100644
--- a/samples/client/petstore/javascript-promise/src/model/Animal.js
+++ b/samples/client/petstore/javascript-promise/src/model/Animal.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
index 3f2944d5971..c7d3ebad562 100644
--- a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
index dcd8e0c1d4d..ab73a6916d3 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
index a86a2a99012..b82c3649035 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
index 8255b45a004..4e4a96d0853 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Capitalization.js b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
index ae1fd0c4691..30232f689dc 100644
--- a/samples/client/petstore/javascript-promise/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Cat.js b/samples/client/petstore/javascript-promise/src/model/Cat.js
index 4e317157112..415bd14582b 100644
--- a/samples/client/petstore/javascript-promise/src/model/Cat.js
+++ b/samples/client/petstore/javascript-promise/src/model/Cat.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/CatAllOf.js b/samples/client/petstore/javascript-promise/src/model/CatAllOf.js
index 86b0e9d9b17..6b26f6e753b 100644
--- a/samples/client/petstore/javascript-promise/src/model/CatAllOf.js
+++ b/samples/client/petstore/javascript-promise/src/model/CatAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Category.js b/samples/client/petstore/javascript-promise/src/model/Category.js
index c8d128d4bce..20f56275204 100644
--- a/samples/client/petstore/javascript-promise/src/model/Category.js
+++ b/samples/client/petstore/javascript-promise/src/model/Category.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ClassModel.js b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
index 7da6fc886e2..b8ecf485e69 100644
--- a/samples/client/petstore/javascript-promise/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Client.js b/samples/client/petstore/javascript-promise/src/model/Client.js
index 08e68c21c0d..42cabd2a038 100644
--- a/samples/client/petstore/javascript-promise/src/model/Client.js
+++ b/samples/client/petstore/javascript-promise/src/model/Client.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Dog.js b/samples/client/petstore/javascript-promise/src/model/Dog.js
index 105da1d74c9..21820fddb02 100644
--- a/samples/client/petstore/javascript-promise/src/model/Dog.js
+++ b/samples/client/petstore/javascript-promise/src/model/Dog.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/DogAllOf.js b/samples/client/petstore/javascript-promise/src/model/DogAllOf.js
index e51ad6c75e3..4110fbfd302 100644
--- a/samples/client/petstore/javascript-promise/src/model/DogAllOf.js
+++ b/samples/client/petstore/javascript-promise/src/model/DogAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
index 6db6b6f038c..b8b3dc37570 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumClass.js b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
index 72e5e9e906f..d1e33b4d8ef 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumTest.js b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
index ea0657f1cbf..0083ab49b06 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/File.js b/samples/client/petstore/javascript-promise/src/model/File.js
index f3b57b5bd97..0d270851df6 100644
--- a/samples/client/petstore/javascript-promise/src/model/File.js
+++ b/samples/client/petstore/javascript-promise/src/model/File.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
index 88c4724af68..9461ed31715 100644
--- a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/FormatTest.js b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
index 1021f5e7c51..050a26eccb3 100644
--- a/samples/client/petstore/javascript-promise/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
index 11e051c3bda..9b2205f028a 100644
--- a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/List.js b/samples/client/petstore/javascript-promise/src/model/List.js
index 38318778983..288cd0f9162 100644
--- a/samples/client/petstore/javascript-promise/src/model/List.js
+++ b/samples/client/petstore/javascript-promise/src/model/List.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/MapTest.js b/samples/client/petstore/javascript-promise/src/model/MapTest.js
index f51233405d0..6d50eff8350 100644
--- a/samples/client/petstore/javascript-promise/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/MapTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index 639e878b756..4c5ab29b9e6 100644
--- a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Model200Response.js b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
index c21fbf9be3c..e5c9e8c5e77 100644
--- a/samples/client/petstore/javascript-promise/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
index ea982d9119f..eddfd298fd2 100644
--- a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Name.js b/samples/client/petstore/javascript-promise/src/model/Name.js
index dccefb9e2df..80eeb127d2a 100644
--- a/samples/client/petstore/javascript-promise/src/model/Name.js
+++ b/samples/client/petstore/javascript-promise/src/model/Name.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
index 607f61dd6db..a71b576260e 100644
--- a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Order.js b/samples/client/petstore/javascript-promise/src/model/Order.js
index 1c1d05c932b..699e9fc6737 100644
--- a/samples/client/petstore/javascript-promise/src/model/Order.js
+++ b/samples/client/petstore/javascript-promise/src/model/Order.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
index 2eee4f23964..faf1409f5ba 100644
--- a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
index 174afad364a..5cf00a1d8d8 100644
--- a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Pet.js b/samples/client/petstore/javascript-promise/src/model/Pet.js
index 5132d7172bc..114ccfd7b10 100644
--- a/samples/client/petstore/javascript-promise/src/model/Pet.js
+++ b/samples/client/petstore/javascript-promise/src/model/Pet.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
index f43eef275f3..51720fc94d0 100644
--- a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
index 556ee41d596..3b9f1780970 100644
--- a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Tag.js b/samples/client/petstore/javascript-promise/src/model/Tag.js
index 01c5cb5363b..2bfb449378e 100644
--- a/samples/client/petstore/javascript-promise/src/model/Tag.js
+++ b/samples/client/petstore/javascript-promise/src/model/Tag.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js b/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js
index 992354a4d3d..10413cd990b 100644
--- a/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js
+++ b/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js b/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js
index 6a431f0091b..dc1e94db3ae 100644
--- a/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js
+++ b/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/User.js b/samples/client/petstore/javascript-promise/src/model/User.js
index ce63af28830..c593bbd335f 100644
--- a/samples/client/petstore/javascript-promise/src/model/User.js
+++ b/samples/client/petstore/javascript-promise/src/model/User.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/XmlItem.js b/samples/client/petstore/javascript-promise/src/model/XmlItem.js
index d410574ad54..d10fa246a7d 100644
--- a/samples/client/petstore/javascript-promise/src/model/XmlItem.js
+++ b/samples/client/petstore/javascript-promise/src/model/XmlItem.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/.openapi-generator/VERSION b/samples/client/petstore/javascript/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/javascript/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js
index d529537b740..2f95d354aa7 100644
--- a/samples/client/petstore/javascript/src/ApiClient.js
+++ b/samples/client/petstore/javascript/src/ApiClient.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
index e803c53e82a..a205bd82cb8 100644
--- a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/FakeApi.js b/samples/client/petstore/javascript/src/api/FakeApi.js
index 2a0543d7276..fbc5aef79d6 100644
--- a/samples/client/petstore/javascript/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript/src/api/FakeApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
index 250f78205f5..957408b720e 100644
--- a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/PetApi.js b/samples/client/petstore/javascript/src/api/PetApi.js
index 28fd3b3d24d..6c6f509fc14 100644
--- a/samples/client/petstore/javascript/src/api/PetApi.js
+++ b/samples/client/petstore/javascript/src/api/PetApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/StoreApi.js b/samples/client/petstore/javascript/src/api/StoreApi.js
index 8a27948b47a..aaa4b5f23ec 100644
--- a/samples/client/petstore/javascript/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript/src/api/StoreApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/UserApi.js b/samples/client/petstore/javascript/src/api/UserApi.js
index e63050a8e58..3d6e941a081 100644
--- a/samples/client/petstore/javascript/src/api/UserApi.js
+++ b/samples/client/petstore/javascript/src/api/UserApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js
index f7028db83eb..d172e7c3e00 100644
--- a/samples/client/petstore/javascript/src/index.js
+++ b/samples/client/petstore/javascript/src/index.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js
index 267f3041d08..73b58a733b1 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js
index f1d4f890be7..3a1f4ecc9d8 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js
index 309dc0f315d..5306f6bd01d 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
index 638b611596d..bd62237ca20 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js
index 717be11a92f..8f678419e25 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js
index 04a967d133f..651c8894aa8 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js
index 3e5e7a80423..b5180bbe828 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js
index 1cf681db0dc..9181dac6014 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js
index b10270da2fa..4477ebc5a97 100644
--- a/samples/client/petstore/javascript/src/model/Animal.js
+++ b/samples/client/petstore/javascript/src/model/Animal.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ApiResponse.js b/samples/client/petstore/javascript/src/model/ApiResponse.js
index 3f2944d5971..c7d3ebad562 100644
--- a/samples/client/petstore/javascript/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript/src/model/ApiResponse.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
index dcd8e0c1d4d..ab73a6916d3 100644
--- a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
index a86a2a99012..b82c3649035 100644
--- a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayTest.js b/samples/client/petstore/javascript/src/model/ArrayTest.js
index 8255b45a004..4e4a96d0853 100644
--- a/samples/client/petstore/javascript/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript/src/model/ArrayTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Capitalization.js b/samples/client/petstore/javascript/src/model/Capitalization.js
index ae1fd0c4691..30232f689dc 100644
--- a/samples/client/petstore/javascript/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript/src/model/Capitalization.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Cat.js b/samples/client/petstore/javascript/src/model/Cat.js
index 4e317157112..415bd14582b 100644
--- a/samples/client/petstore/javascript/src/model/Cat.js
+++ b/samples/client/petstore/javascript/src/model/Cat.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/CatAllOf.js b/samples/client/petstore/javascript/src/model/CatAllOf.js
index 86b0e9d9b17..6b26f6e753b 100644
--- a/samples/client/petstore/javascript/src/model/CatAllOf.js
+++ b/samples/client/petstore/javascript/src/model/CatAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js
index c8d128d4bce..20f56275204 100644
--- a/samples/client/petstore/javascript/src/model/Category.js
+++ b/samples/client/petstore/javascript/src/model/Category.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ClassModel.js b/samples/client/petstore/javascript/src/model/ClassModel.js
index 7da6fc886e2..b8ecf485e69 100644
--- a/samples/client/petstore/javascript/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript/src/model/ClassModel.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Client.js b/samples/client/petstore/javascript/src/model/Client.js
index 08e68c21c0d..42cabd2a038 100644
--- a/samples/client/petstore/javascript/src/model/Client.js
+++ b/samples/client/petstore/javascript/src/model/Client.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Dog.js b/samples/client/petstore/javascript/src/model/Dog.js
index 105da1d74c9..21820fddb02 100644
--- a/samples/client/petstore/javascript/src/model/Dog.js
+++ b/samples/client/petstore/javascript/src/model/Dog.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/DogAllOf.js b/samples/client/petstore/javascript/src/model/DogAllOf.js
index e51ad6c75e3..4110fbfd302 100644
--- a/samples/client/petstore/javascript/src/model/DogAllOf.js
+++ b/samples/client/petstore/javascript/src/model/DogAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumArrays.js b/samples/client/petstore/javascript/src/model/EnumArrays.js
index 6db6b6f038c..b8b3dc37570 100644
--- a/samples/client/petstore/javascript/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript/src/model/EnumArrays.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumClass.js b/samples/client/petstore/javascript/src/model/EnumClass.js
index 72e5e9e906f..d1e33b4d8ef 100644
--- a/samples/client/petstore/javascript/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript/src/model/EnumClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumTest.js b/samples/client/petstore/javascript/src/model/EnumTest.js
index ea0657f1cbf..0083ab49b06 100644
--- a/samples/client/petstore/javascript/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript/src/model/EnumTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/File.js b/samples/client/petstore/javascript/src/model/File.js
index f3b57b5bd97..0d270851df6 100644
--- a/samples/client/petstore/javascript/src/model/File.js
+++ b/samples/client/petstore/javascript/src/model/File.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
index 88c4724af68..9461ed31715 100644
--- a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
+++ b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/FormatTest.js b/samples/client/petstore/javascript/src/model/FormatTest.js
index 1021f5e7c51..050a26eccb3 100644
--- a/samples/client/petstore/javascript/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript/src/model/FormatTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
index 11e051c3bda..9b2205f028a 100644
--- a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/List.js b/samples/client/petstore/javascript/src/model/List.js
index 38318778983..288cd0f9162 100644
--- a/samples/client/petstore/javascript/src/model/List.js
+++ b/samples/client/petstore/javascript/src/model/List.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/MapTest.js b/samples/client/petstore/javascript/src/model/MapTest.js
index f51233405d0..6d50eff8350 100644
--- a/samples/client/petstore/javascript/src/model/MapTest.js
+++ b/samples/client/petstore/javascript/src/model/MapTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index 639e878b756..4c5ab29b9e6 100644
--- a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Model200Response.js b/samples/client/petstore/javascript/src/model/Model200Response.js
index c21fbf9be3c..e5c9e8c5e77 100644
--- a/samples/client/petstore/javascript/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript/src/model/Model200Response.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ModelReturn.js b/samples/client/petstore/javascript/src/model/ModelReturn.js
index ea982d9119f..eddfd298fd2 100644
--- a/samples/client/petstore/javascript/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript/src/model/ModelReturn.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js
index dccefb9e2df..80eeb127d2a 100644
--- a/samples/client/petstore/javascript/src/model/Name.js
+++ b/samples/client/petstore/javascript/src/model/Name.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/NumberOnly.js b/samples/client/petstore/javascript/src/model/NumberOnly.js
index 607f61dd6db..a71b576260e 100644
--- a/samples/client/petstore/javascript/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/NumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Order.js b/samples/client/petstore/javascript/src/model/Order.js
index 1c1d05c932b..699e9fc6737 100644
--- a/samples/client/petstore/javascript/src/model/Order.js
+++ b/samples/client/petstore/javascript/src/model/Order.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/OuterComposite.js b/samples/client/petstore/javascript/src/model/OuterComposite.js
index 2eee4f23964..faf1409f5ba 100644
--- a/samples/client/petstore/javascript/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript/src/model/OuterComposite.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/OuterEnum.js b/samples/client/petstore/javascript/src/model/OuterEnum.js
index 174afad364a..5cf00a1d8d8 100644
--- a/samples/client/petstore/javascript/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript/src/model/OuterEnum.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Pet.js b/samples/client/petstore/javascript/src/model/Pet.js
index 5132d7172bc..114ccfd7b10 100644
--- a/samples/client/petstore/javascript/src/model/Pet.js
+++ b/samples/client/petstore/javascript/src/model/Pet.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
index f43eef275f3..51720fc94d0 100644
--- a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/SpecialModelName.js b/samples/client/petstore/javascript/src/model/SpecialModelName.js
index 556ee41d596..3b9f1780970 100644
--- a/samples/client/petstore/javascript/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript/src/model/SpecialModelName.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js
index 01c5cb5363b..2bfb449378e 100644
--- a/samples/client/petstore/javascript/src/model/Tag.js
+++ b/samples/client/petstore/javascript/src/model/Tag.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/TypeHolderDefault.js b/samples/client/petstore/javascript/src/model/TypeHolderDefault.js
index 992354a4d3d..10413cd990b 100644
--- a/samples/client/petstore/javascript/src/model/TypeHolderDefault.js
+++ b/samples/client/petstore/javascript/src/model/TypeHolderDefault.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/TypeHolderExample.js b/samples/client/petstore/javascript/src/model/TypeHolderExample.js
index 6a431f0091b..dc1e94db3ae 100644
--- a/samples/client/petstore/javascript/src/model/TypeHolderExample.js
+++ b/samples/client/petstore/javascript/src/model/TypeHolderExample.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js
index ce63af28830..c593bbd335f 100644
--- a/samples/client/petstore/javascript/src/model/User.js
+++ b/samples/client/petstore/javascript/src/model/User.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/XmlItem.js b/samples/client/petstore/javascript/src/model/XmlItem.js
index d410574ad54..d10fa246a7d 100644
--- a/samples/client/petstore/javascript/src/model/XmlItem.js
+++ b/samples/client/petstore/javascript/src/model/XmlItem.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/kotlin/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
+++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index c3aaf3d20b8..b78f0f310be 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index 5477004f94b..0b25c56556e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 5651a2fd160..38f93ed9579 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index febabc576b2..369e578510e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index 8d8e4ae6a3b..c9d394c6bc3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index c8cd92a807d..12f4fe98096 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index 1af0b511467..b8ec60f9e99 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index 289bbc307f4..5bc1ac15acd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index 52c22ea0593..4e4091726a1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
index a6803e5803c..3b8b4612de0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
index a15528b8f41..b9f80292c72 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
index 1cb6c4c7bd8..0935afc6265 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index 107b7ddb0cb..0dc0123415e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
index 22614b7c29d..2c812b25e69 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
index 3a3c606512c..fd79e507053 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
index b744d323190..55d41382509 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
index ddbfb971e89..cbd82cbfa07 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index 43aba1da96f..b5b1b280553 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index a07721ebd82..d438ba42885 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index ef4cd4ca088..29186e6bb52 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 92ef71f42e9..aa47c6b47da 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index b46190f4c7c..32d87926070 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index f6286db0043..3529cefaa16 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index c50dc123ab3..bba97a6ca7f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
index 48717ce58b0..ea9af0e3c38 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index ece76d6c6d5..9bcb8e9cd82 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index 5cad59a7f03..57925775113 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index 6640bbc6b12..1eea5d0899c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index 54fec011e13..227eb0aaf7b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
index 938e1ea398a..a70ae53fbce 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index 91be99e0bcc..938c787b0ef 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index 181d7764d9a..f14dc2bff3e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index 1f2085b8b0e..7e454f62866 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index 60b41efb149..85fc4184a0c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index 65c0e19fd32..fdad10d4362 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index 4e3939f4df4..312bdf9cd6c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index b0c83533b7b..ad8c4cac371 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 715e1000637..e039e474d2f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index be0b0c47f14..624813bf0ed 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index be94b123296..04199bad530 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index 26611c645f7..68e093dc88b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index 5256d38d74c..b8925b7eccb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index 524dd442b7c..c20a8d23a2c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index d3b9cd22bbb..809c9c62431 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index cb41e21354c..79f96d52fd9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index 2656b24ccf5..677ccb106f1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index 75c749625a5..657654ce9e8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index 0c1f605da40..f341400c11b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index 7e70821dcd9..b66ccee7cfe 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index fbccef8f728..6925a9ef155 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index 9502d28bcbb..64e88049d75 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 30c12617d05..79132e8b0c5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
index f3ba45aa0ed..2cab44106d3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
index fa83e277385..82926a0c645 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index d811f1f2817..669360fee55 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
index 19f39a01923..a2a690ad4d4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index a5e751952fb..1dfe2db9f62 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index 6166b47a4e6..53ee52ccbc3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 2a215ce9c3f..beaf7ec3478 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 15e330ba25e..3831b1e2dfd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index 8549eecd012..bfdcc5d6e86 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index 08cd08c38a4..4799a949fa5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 1389e04ded7..6c4ec889b2a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
index fb181549143..127df023097 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
index a37e2fa774c..91cad352f78 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
index 1c9ccba974b..9228e312e30 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index 6477faccc75..ad95a50939a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
index 821822ab3ad..562b5e6a22f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
index 502f80ac64f..b502d7d989d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
index 3af964ed4cb..973bed6dc92 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
index 7bf85f19f72..0d739feed19 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 15830e6b1a4..c5342238425 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index ef544551e84..89656b032c4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index 87145daa25e..1080f7a6b93 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index fcac8540e81..3aac20d5349 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index 17bdbbd08bf..56c06699e5f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 9fcb2dba7f7..d72763b1754 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
index 1a2e5985c71..515164ea4be 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 96b5187fe10..8eaba70e32b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index 33b1525195c..1f3c3072053 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 5a266dc4ab9..6ff7e3b413f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index 111803dbd2f..86715c7394e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
index d7af86e0fa5..c5d7e6b5a34 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index e4185142706..0d504dbd2cd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index 3fb1c3c30cc..092f5f2a3aa 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index 8631e819b2f..c5e6c977355 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index 5f3a72fe430..4cf96be1a90 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index c10be01d4bb..9224e29fdbd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index b366c65dc58..ca5a8391324 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index 6e2952491cd..c7f054bb5d8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index 6f8cc6d45e0..781e9ea05b6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index ee02e3c286f..988f84325b1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 46343472fec..e9c0be20dbd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index b23e6adb910..f1642dde446 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index 0094fc127ca..09780d92b52 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index 594f007c87e..f434b7022fe 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index 7b6357a62d0..4bb7896b085 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index b7cd833f995..1dfde7afc1f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index b3e9359c479..d75e55996a3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index d5c6612332c..13a8caae0c5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index eca5ba854f3..f4dc59e1003 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index 9e987a1d808..a0a132187b4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index e0767c886ef..2af7be4caf6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index a2fef7b4b96..6ecf877b9e1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index 0134bc35428..56eeb12d857 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
index 9fcf8db4f9a..0cdc184355d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
index 53da7b211e5..a677e810f7d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index c5720784e87..8ba90d5289e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
index 0371b82b800..9ffd08c51df 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION
+++ b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python-tornado/.openapi-generator/VERSION b/samples/client/petstore/python-tornado/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/python-tornado/.openapi-generator/VERSION
+++ b/samples/client/petstore/python-tornado/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python/.openapi-generator/VERSION b/samples/client/petstore/python/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/python/.openapi-generator/VERSION
+++ b/samples/client/petstore/python/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/ruby/.openapi-generator/VERSION
+++ b/samples/client/petstore/ruby/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index 03b26609f54..52e3ec87247 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
index 6a68b8cbe77..055a3664302 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
index a42e303c189..3ae2d60d1df 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
index 27990e622fa..943e479197d 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
index 6e60c9408b4..5883cfffb31 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
index b3017541e7c..3f65b6afb8d 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
index 48000a5130d..2a9cbc17c4e 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb
index be77c47b3b3..21197e84b3f 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb
index e382771ee26..9eab46a89b7 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_error.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb
index 857e8318396..e74a2a38ff0 100644
--- a/samples/client/petstore/ruby/lib/petstore/configuration.rb
+++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb
index 58c1955e879..d2af1ba5b32 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb
index 6895d7b0807..621e290e157 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb
index 7672c810147..787951bf683 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
index f178be39d2d..27f9768fb8d 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb
index ae612732d6b..5ed4bd9381e 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb
index 0a3d85bcd6c..3499c090be6 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb
index e525cc8341a..fd957eb08f7 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb
index 178b6d31705..ca5e5385952 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
index 6eb2bc0b3de..396199ca411 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
index 60f0120e03e..998250d20ae 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
index 29774b89d85..99aa9482fa3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
index 3765b7d4a56..e7da1699d45 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
index 9821695c69c..121bff2f022 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
index 225e4f646e4..02567bdfd45 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
index c2c86019bdf..51ab33355e3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
index 3f3802dd87e..a971e6f5566 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb
index 42ac5c8b313..344ca690654 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
index 118553a01e1..01b2b965d60 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb
index 9903a3b000e..830ab1d0f00 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
index f6f5ef33ced..07c31216bc3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
index 783e7c07544..18cf6197720 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
index 46294ae347a..1f12cb43b9c 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
index 8ee977570db..406b0dccc95 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
index db14424ccd7..0a2b987f345 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb
index da7179faedd..459e4deba8f 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/file.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
index 9d6d2b6e7d0..c01bb104a3e 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
index 93d70ef1f83..4638d9f36e1 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
index 8cbc21dc8af..6d24ac174c5 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb
index 6b3bb37d185..ab8318101b5 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/list.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
index 61d2eca931b..68509874a7d 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
index be2f222448e..f82bdde7721 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
index 8dad3cbc998..d87939a4b8a 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
index ec1867c0402..32b75d1f088 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb
index 6c6098da26c..665fc352764 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/name.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
index 868b01f0e4c..8b6da24af4b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb
index 06a30ca375a..bcfc925dbf3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
index 531535313df..1cfbf6659a7 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
index b93f5dd6b5b..c7d622d9703 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
index f8787f3889a..20a476bbe9f 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
index 5329f653d7b..012f382be79 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
index 0eb75eb749c..b2bc0dc84a6 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
index 8db47755825..6d79193b09a 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb b/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb
index bcbd1e70bff..362ceff7a85 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb b/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb
index 4c3011ef4f6..63390983f38 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb
index 89afffa96bf..5b97445cc16 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb b/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb
index 131d15a41f9..9c26309da19 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb
index 04c6d8d3a53..29645445838 100644
--- a/samples/client/petstore/ruby/lib/petstore/version.rb
+++ b/samples/client/petstore/ruby/lib/petstore/version.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec
index 40ae414770a..167ff9a753e 100644
--- a/samples/client/petstore/ruby/petstore.gemspec
+++ b/samples/client/petstore/ruby/petstore.gemspec
@@ -8,11 +8,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb b/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb
index 30c6531c02f..6e202fb43d0 100644
--- a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
index f329eb08a81..ac6be349ff9 100644
--- a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb b/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
index 37b84134abd..7080b34d9f8 100644
--- a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
index bc05dd8af2b..efd0fc640e5 100644
--- a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
index 723a138afb1..7dd515a5f30 100644
--- a/samples/client/petstore/ruby/spec/api/store_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
index b48a94e1a6a..eb3fc636250 100644
--- a/samples/client/petstore/ruby/spec/api/user_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb
index c4481e5171b..274d78c14cc 100644
--- a/samples/client/petstore/ruby/spec/api_client_spec.rb
+++ b/samples/client/petstore/ruby/spec/api_client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/configuration_spec.rb b/samples/client/petstore/ruby/spec/configuration_spec.rb
index d10e4b23dda..08263fa509b 100644
--- a/samples/client/petstore/ruby/spec/configuration_spec.rb
+++ b/samples/client/petstore/ruby/spec/configuration_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb
index 4c4dfc5a279..846f3dec887 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb
index 51abe4311f3..ef280e7316e 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb
index e844f403850..c56d64e4188 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
index 5d9ab89da3f..864bf2d883e 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb
index 232e5cb19c2..78868109a69 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb
index 5950177647e..9a33ded47a6 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb
index c6ed9d5fc03..c9182ce6646 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb
index a186b81dbe6..b2c5288ec48 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/animal_spec.rb b/samples/client/petstore/ruby/spec/models/animal_spec.rb
index 6444e48f8e1..08155ef3949 100644
--- a/samples/client/petstore/ruby/spec/models/animal_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/animal_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
index b8d7f8db8c9..991bb81df72 100644
--- a/samples/client/petstore/ruby/spec/models/api_response_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb b/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
index af3da826561..372539c55cb 100644
--- a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb b/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
index 706c9e7731a..759a272f686 100644
--- a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/array_test_spec.rb b/samples/client/petstore/ruby/spec/models/array_test_spec.rb
index c5cf5d30a02..c3819c9a9f6 100644
--- a/samples/client/petstore/ruby/spec/models/array_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/array_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
index d454b7b63ed..98059918537 100644
--- a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb
index 479a933e21a..49859a0524f 100644
--- a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/cat_spec.rb b/samples/client/petstore/ruby/spec/models/cat_spec.rb
index a5785a1697c..0ee7d2a7f68 100644
--- a/samples/client/petstore/ruby/spec/models/cat_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/cat_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/category_spec.rb b/samples/client/petstore/ruby/spec/models/category_spec.rb
index 2ed0bec7c6c..1f9f8897fde 100644
--- a/samples/client/petstore/ruby/spec/models/category_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/category_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/class_model_spec.rb b/samples/client/petstore/ruby/spec/models/class_model_spec.rb
index 61d29ad31ca..589f3d1f121 100644
--- a/samples/client/petstore/ruby/spec/models/class_model_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/class_model_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/client_spec.rb b/samples/client/petstore/ruby/spec/models/client_spec.rb
index e031f0a3366..b246962e2ba 100644
--- a/samples/client/petstore/ruby/spec/models/client_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb
index 200a7d0a7e7..6cba24ecd94 100644
--- a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/dog_spec.rb b/samples/client/petstore/ruby/spec/models/dog_spec.rb
index 97ccdb0e866..d13a6864497 100644
--- a/samples/client/petstore/ruby/spec/models/dog_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/dog_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
index f74ff0251ef..993d8f3a3ee 100644
--- a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
index 94551ecd235..50c56e53df8 100644
--- a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
index ac5226130f3..b66e5d730f6 100644
--- a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb b/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
index ff922dc1c55..c59870f674f 100644
--- a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/file_spec.rb b/samples/client/petstore/ruby/spec/models/file_spec.rb
index 7cb23a664ee..38513a9593e 100644
--- a/samples/client/petstore/ruby/spec/models/file_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/file_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
index e1f8b7976a5..3ce512bc788 100644
--- a/samples/client/petstore/ruby/spec/models/format_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb b/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
index 01e6d0df6d9..f1e7908be13 100644
--- a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/list_spec.rb b/samples/client/petstore/ruby/spec/models/list_spec.rb
index c89a90864d6..305f503079d 100644
--- a/samples/client/petstore/ruby/spec/models/list_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/list_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/map_test_spec.rb b/samples/client/petstore/ruby/spec/models/map_test_spec.rb
index 5da2ca13d0d..6be8c3aff53 100644
--- a/samples/client/petstore/ruby/spec/models/map_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/map_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
index 52992adccb0..d9070acf516 100644
--- a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb
index f42829bd563..6502d960cb8 100644
--- a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
index 8fee9ad96bc..e4fc442810c 100644
--- a/samples/client/petstore/ruby/spec/models/model_return_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/name_spec.rb b/samples/client/petstore/ruby/spec/models/name_spec.rb
index b0354944cdf..362d499d125 100644
--- a/samples/client/petstore/ruby/spec/models/name_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/number_only_spec.rb b/samples/client/petstore/ruby/spec/models/number_only_spec.rb
index df54f816c31..440a2d377d7 100644
--- a/samples/client/petstore/ruby/spec/models/number_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/order_spec.rb b/samples/client/petstore/ruby/spec/models/order_spec.rb
index 31f3548f238..45788b835ab 100644
--- a/samples/client/petstore/ruby/spec/models/order_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/order_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb
index e06f75b5422..a7c25a114cc 100644
--- a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb b/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb
index 99716659230..f6de5c89911 100644
--- a/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/pet_spec.rb b/samples/client/petstore/ruby/spec/models/pet_spec.rb
index 868fcdd4979..b0c7076815b 100644
--- a/samples/client/petstore/ruby/spec/models/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/pet_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb
index f3fdb195692..d8a42302760 100644
--- a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
index 0aad11f5661..43eb2ec61ec 100644
--- a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/tag_spec.rb b/samples/client/petstore/ruby/spec/models/tag_spec.rb
index 04038aa3e77..abb8380ff3a 100644
--- a/samples/client/petstore/ruby/spec/models/tag_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/tag_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb b/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb
index 4e3233bdf9c..3cee11d7ba0 100644
--- a/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb b/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb
index 4bbdaa4d5a1..0edc334dd65 100644
--- a/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/user_spec.rb b/samples/client/petstore/ruby/spec/models/user_spec.rb
index 580a180eae9..d313a360bbb 100644
--- a/samples/client/petstore/ruby/spec/models/user_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/user_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/xml_item_spec.rb b/samples/client/petstore/ruby/spec/models/xml_item_spec.rb
index f59bd3986c2..c7d06a3580e 100644
--- a/samples/client/petstore/ruby/spec/models/xml_item_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/xml_item_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb
index 4dfb22a9d22..dc8611b437d 100644
--- a/samples/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/client/petstore/ruby/spec/spec_helper.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
index b0678ab0c9c..43e52b7af01 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index 1c3d7ef46ef..033f7a02ac0 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
index ab414884625..6d29de21e77 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
index 59313544d58..fcd4c943704 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index b0716cc5ec3..1137beea308 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
index 89f29af86f6..011a76a9432 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION b/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml
index f1a26529c8a..a8b81bb1118 100644
--- a/samples/meta-codegen/lib/pom.xml
+++ b/samples/meta-codegen/lib/pom.xml
@@ -121,11 +121,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
         <openapi-generator-version>4.1.0-SNAPSHOT</openapi-generator-version>
-=======
-        <openapi-generator-version>4.0.2-SNAPSHOT</openapi-generator-version>
->>>>>>> origin/master
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>
     </properties>
diff --git a/samples/meta-codegen/usage/.openapi-generator/VERSION b/samples/meta-codegen/usage/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/meta-codegen/usage/.openapi-generator/VERSION
+++ b/samples/meta-codegen/usage/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index 6500fb4a3aa..61aae7c8ca7 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
index c356cb15f88..e139ca407c5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index 64390d70b1a..1ded149c734 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 6f592e36a52..5debe2f84c6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index 118f2eb2f33..4e1d147a0c5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index da425154780..1814d637702 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index f8889cdc325..61bd517389a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index 1af0b511467..b8ec60f9e99 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index 391eda01fbe..752e5c32089 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index 52c22ea0593..4e4091726a1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index 6b7344d0d7b..f3d1b3cace4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index 43aba1da96f..b5b1b280553 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index a07721ebd82..d438ba42885 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index ef4cd4ca088..29186e6bb52 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 92ef71f42e9..aa47c6b47da 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index b46190f4c7c..32d87926070 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index f6286db0043..3529cefaa16 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index c50dc123ab3..bba97a6ca7f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
index 48717ce58b0..ea9af0e3c38 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index ece76d6c6d5..9bcb8e9cd82 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index 5cad59a7f03..57925775113 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index 6640bbc6b12..1eea5d0899c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index 54fec011e13..227eb0aaf7b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
index 938e1ea398a..a70ae53fbce 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index 91be99e0bcc..938c787b0ef 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index 181d7764d9a..f14dc2bff3e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index fcea3495a2e..0352fc1d9f5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index 60b41efb149..85fc4184a0c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index 65c0e19fd32..fdad10d4362 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
index ce1609278b1..d139d6e6414 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index b0d2565571a..4cf542fdcf6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index b0c83533b7b..ad8c4cac371 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
index 2c56ce0fa10..5bf520267ad 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
index 8ac3aef5a80..1edeb0e020c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
index 5a13c282d9c..98ef9162986 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
index 9b3091f6533..b7ec1d59dbc 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
index b73ff04fefb..9a2f14f946d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
index 4d74b6bbd85..ffbb883a0bd 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
index 2ae11229683..efb8180e1e6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
index 288161f8465..2eddfee7775 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 715e1000637..e039e474d2f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index be0b0c47f14..624813bf0ed 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index be94b123296..04199bad530 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index 26611c645f7..68e093dc88b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index 5256d38d74c..b8925b7eccb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index 524dd442b7c..c20a8d23a2c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index d3b9cd22bbb..809c9c62431 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
index cf609bb0a16..32cc64c466e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index cb41e21354c..79f96d52fd9 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index 2656b24ccf5..677ccb106f1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index 75c749625a5..657654ce9e8 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index 0c1f605da40..f341400c11b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
index ea1d9781485..c5f35dd7fee 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
index 8f28b9ee4a1..3d43c34ad30 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
index 34d08d4d73f..13e45306848 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index 7e70821dcd9..b66ccee7cfe 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index fbccef8f728..6925a9ef155 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index 0fe44d66edb..0ecfe2ff32e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 30c12617d05..79132e8b0c5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index d811f1f2817..669360fee55 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index a5e751952fb..1dfe2db9f62 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index 6166b47a4e6..53ee52ccbc3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
index cdfea77a287..1bbe5f64572 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 823c3aaaa7e..38d33da5526 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 15e330ba25e..3831b1e2dfd 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index 8549eecd012..bfdcc5d6e86 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index 08cd08c38a4..4799a949fa5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 1389e04ded7..6c4ec889b2a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index 9801359fc6c..a7c9b44a882 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 15830e6b1a4..c5342238425 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index ef544551e84..89656b032c4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index 87145daa25e..1080f7a6b93 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index fcac8540e81..3aac20d5349 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index 17bdbbd08bf..56c06699e5f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 9fcb2dba7f7..d72763b1754 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
index 1a2e5985c71..515164ea4be 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 96b5187fe10..8eaba70e32b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index 33b1525195c..1f3c3072053 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 5a266dc4ab9..6ff7e3b413f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index 111803dbd2f..86715c7394e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
index d7af86e0fa5..c5d7e6b5a34 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index e4185142706..0d504dbd2cd 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index 3fb1c3c30cc..092f5f2a3aa 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index 8631e819b2f..c5e6c977355 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index 40c8d53e598..07c7239ec80 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index c10be01d4bb..9224e29fdbd 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index b366c65dc58..ca5a8391324 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
index 1fd49cbf9b2..a0d49bae6b3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index b34d6ac3006..03dfc42c80c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index 6f8cc6d45e0..781e9ea05b6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
index f9446634da6..3568f79ee19 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
index 780e2b8d8a6..ac78be001ec 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
index 4f54c7cbbd6..191d616ecdc 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
index 28b2e103324..8c2ca111f1a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
index 868cd68ace4..03638106245 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
index 9fc77b185bf..602886f5a64 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
index e1f968ff3e2..329a88f46d9 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
index 777f35547f9..bce3085de51 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index ee02e3c286f..988f84325b1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 46343472fec..e9c0be20dbd 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index b23e6adb910..f1642dde446 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index 0094fc127ca..09780d92b52 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index 594f007c87e..f434b7022fe 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index 7b6357a62d0..4bb7896b085 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
index 21afd768513..d6c47a8d485 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index b7cd833f995..1dfde7afc1f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index b3e9359c479..d75e55996a3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index d5c6612332c..13a8caae0c5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
index 2132de98868..739033dc951 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
index 8b7735f2f05..1cb9689868b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
index 3db33021349..139ff211f5b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index eca5ba854f3..f4dc59e1003 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index 9e987a1d808..a0a132187b4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index e0767c886ef..2af7be4caf6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index a2fef7b4b96..6ecf877b9e1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index 0134bc35428..56eeb12d857 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index c5720784e87..8ba90d5289e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION b/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore.rb b/samples/openapi3/client/petstore/ruby/lib/petstore.rb
index 63b5718e944..822ea45c06a 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
index c8252e85a97..f52979835a9 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb
index 7cdf46d7221..0eeb793c222 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb
index 5d46de88b28..e5727f62228 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
index fc0bc988041..9a9db472760 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb
index 93fdbdfcb8f..29906165e64 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb
index c3d6c2a028c..ee045312892 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb
index cecde15f0ef..bd2f593693a 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb
index be77c47b3b3..21197e84b3f 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb
index e382771ee26..9eab46a89b7 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb
index 27c3b7279a3..0d9aad384b3 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
index ab2417a4434..a4b791a17f7 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb
index 6eb2bc0b3de..396199ca411 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb
index 60f0120e03e..998250d20ae 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
index 29774b89d85..99aa9482fa3 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
index 3765b7d4a56..e7da1699d45 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb
index 9821695c69c..121bff2f022 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb
index 225e4f646e4..02567bdfd45 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb
index c2c86019bdf..51ab33355e3 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
index 3f3802dd87e..a971e6f5566 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb
index 42ac5c8b313..344ca690654 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb
index 118553a01e1..01b2b965d60 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb
index 9903a3b000e..830ab1d0f00 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb
index f6f5ef33ced..07c31216bc3 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
index 783e7c07544..18cf6197720 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
index 46294ae347a..1f12cb43b9c 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb
index 8ee977570db..406b0dccc95 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb
index 58bc59f4595..6db05c48aaa 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb
index da7179faedd..459e4deba8f 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
index 9d6d2b6e7d0..c01bb104a3e 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb
index 831b26219e5..0546ad92695 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb
index b4c8c091def..010a1d0efad 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
index 8cbc21dc8af..6d24ac174c5 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb
index 41c348efa18..7d31c85a1d3 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb
index a537ed4f347..fa811479dc0 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb
index 6b3bb37d185..ab8318101b5 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb
index 61d2eca931b..68509874a7d 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
index be2f222448e..f82bdde7721 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb
index 8dad3cbc998..d87939a4b8a 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb
index ec1867c0402..32b75d1f088 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb
index 6c6098da26c..665fc352764 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb
index 3607b10e299..eab0edde201 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb
index 868b01f0e4c..8b6da24af4b 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb
index 06a30ca375a..bcfc925dbf3 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb
index 531535313df..1cfbf6659a7 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb
index b93f5dd6b5b..c7d622d9703 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb
index 39640987742..38e51df938c 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb
index 0b8205964e5..70788d1e873 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb
index 1a555883900..0d074b8b9f5 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb
index f8787f3889a..20a476bbe9f 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb
index 5329f653d7b..012f382be79 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb
index 0eb75eb749c..b2bc0dc84a6 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb
index 8db47755825..6d79193b09a 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb
index 89afffa96bf..5b97445cc16 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb
index 04c6d8d3a53..29645445838 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/petstore.gemspec b/samples/openapi3/client/petstore/ruby/petstore.gemspec
index 40ae414770a..167ff9a753e 100644
--- a/samples/openapi3/client/petstore/ruby/petstore.gemspec
+++ b/samples/openapi3/client/petstore/ruby/petstore.gemspec
@@ -8,11 +8,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb
index 77233a7f440..7fc8ef59bdc 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb
index ee55c964d6a..132532dde17 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb
index e3917cfcedd..f0d6a13636f 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
index e765df61812..12c2278ca20 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb
index cf54f2cb251..a202df82415 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb
index a7f4dcd50fe..61b633b4085 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb
index ae1ea5e7226..248006835ed 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb
index c4481e5171b..274d78c14cc 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb b/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
index d10e4b23dda..08263fa509b 100644
--- a/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
index c2bf696fce1..a6885692f64 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb
index 6444e48f8e1..08155ef3949 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb
index b8d7f8db8c9..991bb81df72 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
index af3da826561..372539c55cb 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
index 706c9e7731a..759a272f686 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb
index c5cf5d30a02..c3819c9a9f6 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb
index d454b7b63ed..98059918537 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb
index 479a933e21a..49859a0524f 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb
index a5785a1697c..0ee7d2a7f68 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb
index 2ed0bec7c6c..1f9f8897fde 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb
index 61d29ad31ca..589f3d1f121 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb
index e031f0a3366..b246962e2ba 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb
index 200a7d0a7e7..6cba24ecd94 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb
index 97ccdb0e866..d13a6864497 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb
index f74ff0251ef..993d8f3a3ee 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb
index 94551ecd235..50c56e53df8 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb
index b81f4c6b04d..903b7f9c9ef 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
index ff922dc1c55..c59870f674f 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb
index 7cb23a664ee..38513a9593e 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb
index d673375c02b..829f18ac0d9 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb
index 1e234866da0..3b015816707 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
index 01e6d0df6d9..f1e7908be13 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb
index 5659f9a035e..d94dfae3e1a 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb
index 84c2ce6eac3..859051fae22 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb
index c89a90864d6..305f503079d 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb
index 5da2ca13d0d..6be8c3aff53 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
index 52992adccb0..d9070acf516 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb
index f42829bd563..6502d960cb8 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb
index 8fee9ad96bc..e4fc442810c 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb
index b0354944cdf..362d499d125 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb
index 3635b0c6ee4..b7a8c99c1b5 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb
index df54f816c31..440a2d377d7 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb
index 31f3548f238..45788b835ab 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb
index e06f75b5422..a7c25a114cc 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb
index 45f192233e9..80c852db9fb 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb
index 453a373157c..0be262b5dfc 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb
index ed04851687d..9696979e03c 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb
index 99716659230..f6de5c89911 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb
index 868fcdd4979..b0c7076815b 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb
index f3fdb195692..d8a42302760 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb
index 0aad11f5661..43eb2ec61ec 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb
index 04038aa3e77..abb8380ff3a 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb
index 580a180eae9..d313a360bbb 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb b/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
index 4dfb22a9d22..dc8611b437d 100644
--- a/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 4.1.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/schema/petstore/mysql/.openapi-generator/VERSION b/samples/schema/petstore/mysql/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/schema/petstore/mysql/.openapi-generator/VERSION
+++ b/samples/schema/petstore/mysql/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md
index 1714a1b2baa..c5ad5592661 100644
--- a/samples/server/petstore/kotlin-server/ktor/README.md
+++ b/samples/server/petstore/kotlin-server/ktor/README.md
@@ -2,11 +2,7 @@
 
 This is a sample server Petstore server. For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.
 
-<<<<<<< HEAD
 Generated by OpenAPI Generator 4.1.0-SNAPSHOT.
-=======
-Generated by OpenAPI Generator 4.0.2-SNAPSHOT.
->>>>>>> origin/master
 
 ## Requires
 
diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/.openapi-generator/VERSION b/samples/server/petstore/php-slim/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/php-slim/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-slim/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION
+++ b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
+++ b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 9eaa5fe5e4d..200571e46f5 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
index 805249ab7ca..50a795a4834 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index d26884597e0..4001c758942 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
index 830d7121e50..e28e479cb12 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
index 6b7835c4c64..7ad7e7a8e77 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
index 13d57a8efa0..bbec568a4a1 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
index bed62bd5b3b..491911c3bd8 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
index 2e049375315..67b6c917770 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 3bb065d2f81..2296062bc26 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
index cd8cc0ef708..1eed442687b 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
index 1ea7128bbb3..52d5b5eb80b 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
index ebd7a5a891c..208c959c9a1 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 830e2405e07..3208591b152 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
index 44c4a0ad457..5162b022f20 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index c1d6144ebb4..4ff2855742b 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
index ec0f60f7462..370eb74089c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
index 3473e703413..8dad1488c66 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
index b258dd9754a..95c11daa288 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 830e2405e07..3208591b152 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
index 44c4a0ad457..5162b022f20 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index c1d6144ebb4..4ff2855742b 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
index ec0f60f7462..370eb74089c 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
index 3473e703413..8dad1488c66 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
index b258dd9754a..95c11daa288 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 392e5792014..f59b48e0d80 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
index f519ea522e8..e305846684c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 2d07e98611b..6cc14a31808 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
index 7c69d35e261..d54f8f5502f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
index a958fda34c7..9ed8c53d429 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
index 8c3c6d524e1..3cfd9cf707c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 830e2405e07..3208591b152 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index 44c4a0ad457..5162b022f20 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index c1d6144ebb4..4ff2855742b 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
index ec0f60f7462..370eb74089c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index 3473e703413..8dad1488c66 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
index b258dd9754a..95c11daa288 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 3b49dd6b091..63e4f575496 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 4977905c78a..cf22349d94d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 8c67df2bd36..4b9b6a8beff 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
index ea51cd12577..00a35ef3810 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index cd8a3888a68..edfe60f324d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
index ac3828b2e72..b45e6afcc42 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 739b60d5ce1..353f2ed77b1 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index d193920e587..e5b842a97be 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index ea52e54f471..121b8b7c401 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
index b19f58d10e4..96c92eee137 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
index e8393c9a505..38dfb5cf45c 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
index 04faa361928..ae426eeaba3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
index bed62bd5b3b..491911c3bd8 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index 59e96299153..98dfec25137 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 3bb065d2f81..2296062bc26 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
index 853e274f169..227710d64cd 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
index 1ea7128bbb3..52d5b5eb80b 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
index ebd7a5a891c..208c959c9a1 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
index e5894d861df..00a115c4e42 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
index de8d4e1e417..afaba765c2c 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
index 8905e80d4d9..c4615f35bd1 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
index 885e24a4bd1..a8bc0a1f3b6 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
index a3b5141579e..c34b3740c8d 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
index aed8385d528..1b0bed4ed86 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION
index f2f9c59cf39..83a328a9227 100644
--- a/samples/server/petstore/springboot/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
index bed62bd5b3b..491911c3bd8 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
index d829e4abc1f..4962c13375f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 3bb065d2f81..2296062bc26 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
index cd8cc0ef708..1eed442687b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index 1ea7128bbb3..52d5b5eb80b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
index ebd7a5a891c..208c959c9a1 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */