diff --git a/samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION b/samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION
index a711b94f291..d99e7162d01 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION
@@ -1,9 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
index fcf60c919f8..793ac6a7341 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
@@ -137,6 +137,8 @@ class ApiClient {
           return client.delete(url, headers: headerParams);
         case "PATCH":
           return client.patch(url, headers: headerParams, body: msgBody);
+        case "HEAD":
+          return client.head(url, headers: headerParams);
         default:
           return client.get(url, headers: headerParams);
       }
diff --git a/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
index a711b94f291..d99e7162d01 100644
--- a/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
+++ b/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
@@ -1,9 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/go-experimental/go-petstore/client.go b/samples/client/petstore/go-experimental/go-petstore/client.go
index c73a8db8d09..343078e15cd 100644
--- a/samples/client/petstore/go-experimental/go-petstore/client.go
+++ b/samples/client/petstore/go-experimental/go-petstore/client.go
@@ -350,6 +350,9 @@ func (c *APIClient) prepareRequest(
 }
 
 func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err error) {
+	if len(b) == 0 {
+		return nil
+	}
 	if s, ok := v.(*string); ok {
 		*s = string(b)
 		return nil
diff --git a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION
index e4955748d3e..d99e7162d01 100644
--- a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.2-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION
index e4955748d3e..d99e7162d01 100644
--- a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.2-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION
index e4955748d3e..d99e7162d01 100644
--- a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.2-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION
index e4955748d3e..d99e7162d01 100644
--- a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.2-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/nim/.openapi-generator/VERSION b/samples/client/petstore/nim/.openapi-generator/VERSION
index a711b94f291..d99e7162d01 100644
--- a/samples/client/petstore/nim/.openapi-generator/VERSION
+++ b/samples/client/petstore/nim/.openapi-generator/VERSION
@@ -1,9 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
+5.0.0-SNAPSHOT
\ No newline at end of file
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 cd3600211df..f7ebb34cc98 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 6ae593b427a..588a0cbf8b1 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 8722589a0e1..25ee8db1019 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 4d1f976a0c0..49a00a98ae0 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 427e1bb4a75..9e1ca342942 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 56e08cda3d4..036f9d0fce7 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 b9a4d3f6e11..8daebca96f6 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 6a90c32e300..a02060cd31e 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 392d9368c62..a859f118bc4 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 0f9dda74d52..0deed6ba84a 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 318b40f89cc..a2ad19f3a67 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 2eea21f5ef6..adbb587d9c6 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 d86910124f5..cb978d8260c 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 201ef3bd620..9086aac5dd0 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 a932ae2c350..22b4da20273 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 eadf4e4960a..769fb143806 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 50e79c1e8da..3888a2acbca 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 1cb2acfe13f..01739a814f1 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 dabf6d30c29..091dbcd8411 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 58b6bd9c728..48852ba5569 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 876e8af23f0..93093478e70 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 a0a8f88bb1f..53f1a0aa495 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 676d136f2a8..ae8a8b25643 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 b10ccc2633a..cc76f2903b3 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 f0436323682..2cf80044760 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 6c4af217095..0f6f81ae75a 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 459f2554f36..95946267855 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 26e402ccc3f..970a127d253 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 765d6441c57..79b5918d80a 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 a47fb2bcb6f..8cbc69bb7b3 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 40f897793e1..3cc7df9e6e3 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 d645228eb5e..86b34f5ccad 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 c29b4c02cc2..e5911434956 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 8943413aeb7..68a4b0dc43a 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 907943e72a8..42ddddff86c 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 db82691faf1..d9c8a9bb5a2 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 d27201d14ff..5fcb6299065 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 36044796328..f6fd81b3ca1 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 aee1ec18ca4..4c9c784f628 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 18217c27cd9..02232a6d164 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 74ff1744302..d89a2460ced 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 5847eec7b34..aefed931c95 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 a6bf66d5933..3d409221454 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 18ceb4699ed..ac3865d7311 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 e971fe38753..975ea9134d5 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 45acbd3770a..a3d27b5bd41 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 bc0494ff301..2b42e29c51a 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 ac46a57daec..f375ba8096d 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 306b8c88a8c..15bbe96a104 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 a1036a377e9..8bf77c7c2ba 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 745ea56d0ad..9672d99f1e7 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 f41e94183e0..4b7f555c896 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: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**
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 7cbe2e78aad..a83b3e64916 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 60f4008028a..f03b49d7833 100644
--- a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 f4ce6f2178e..eff08f1c93c 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 3df9046501c..ca3fcccb207 100644
--- a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 ebe083f686a..2e82a54da14 100644
--- a/samples/client/petstore/ruby/spec/api/store_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 7625e1cd19a..1c0b025a3c3 100644
--- a/samples/client/petstore/ruby/spec/api/user_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb
index 33ede96b49b..40811533188 100644
--- a/samples/client/petstore/ruby/spec/api_client_spec.rb
+++ b/samples/client/petstore/ruby/spec/api_client_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/configuration_spec.rb b/samples/client/petstore/ruby/spec/configuration_spec.rb
index be549c30bc4..0bea24033c6 100644
--- a/samples/client/petstore/ruby/spec/configuration_spec.rb
+++ b/samples/client/petstore/ruby/spec/configuration_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 898812dcf4f..9fd0455c8d1 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 3ed1fcb4c10..5f3e0b37987 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 0dca310cc05..c586dfe067a 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 39675fc37a5..ee65b12fcc1 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 ea77b8ef4d3..2bc9d2238a2 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 daaddc34478..9cb2c965c96 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 d993614b8b2..c8cfee233f0 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 b11048f05c8..d658f506473 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/animal_spec.rb b/samples/client/petstore/ruby/spec/models/animal_spec.rb
index 886387d824c..8b3e9adc537 100644
--- a/samples/client/petstore/ruby/spec/models/animal_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/animal_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 7bb27bc462f..628f1c4d7c1 100644
--- a/samples/client/petstore/ruby/spec/models/api_response_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 9fd8b1dcf17..ea41c9a4b38 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 7a7ce9edcff..ba90932a797 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 c9309afc0b8..6ff7397ad43 100644
--- a/samples/client/petstore/ruby/spec/models/array_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/array_test_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
index 029ad6883af..451c59af970 100644
--- a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 2d12de79ff1..926ce8a2a37 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/cat_spec.rb b/samples/client/petstore/ruby/spec/models/cat_spec.rb
index 2a2d12469ff..3efb677ce64 100644
--- a/samples/client/petstore/ruby/spec/models/cat_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/cat_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/category_spec.rb b/samples/client/petstore/ruby/spec/models/category_spec.rb
index 76cd7315703..82ecd78d966 100644
--- a/samples/client/petstore/ruby/spec/models/category_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/category_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 2d4b19e484c..761e8933127 100644
--- a/samples/client/petstore/ruby/spec/models/class_model_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/class_model_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/client_spec.rb b/samples/client/petstore/ruby/spec/models/client_spec.rb
index c7d3f30c794..4bf1ce0622b 100644
--- a/samples/client/petstore/ruby/spec/models/client_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/client_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 c5a90f6018d..5596927d423 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/dog_spec.rb b/samples/client/petstore/ruby/spec/models/dog_spec.rb
index 2905492a554..b82df3e9d72 100644
--- a/samples/client/petstore/ruby/spec/models/dog_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/dog_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 469000b386c..ac75c92581d 100644
--- a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 97a4dde432d..29fcd05aa75 100644
--- a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 a89e49cbe2c..acd89c52dfe 100644
--- a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 bcc36bfe20a..8a8d92658c9 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/file_spec.rb b/samples/client/petstore/ruby/spec/models/file_spec.rb
index adbc136d4f1..b9d1499766e 100644
--- a/samples/client/petstore/ruby/spec/models/file_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/file_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 cb82f23a35b..953fc14a6d1 100644
--- a/samples/client/petstore/ruby/spec/models/format_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 be2313b3cc3..9efa03a22fe 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/list_spec.rb b/samples/client/petstore/ruby/spec/models/list_spec.rb
index 6e5c2ba353a..db397aa108f 100644
--- a/samples/client/petstore/ruby/spec/models/list_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/list_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 1cb78a21bfc..f7ff6788b09 100644
--- a/samples/client/petstore/ruby/spec/models/map_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/map_test_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 0a6dbed9975..0e88f472524 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 47782594793..133f6b94c14 100644
--- a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 7b28f5bcf04..57d400eb116 100644
--- a/samples/client/petstore/ruby/spec/models/model_return_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/name_spec.rb b/samples/client/petstore/ruby/spec/models/name_spec.rb
index aedde807f31..c882db4f221 100644
--- a/samples/client/petstore/ruby/spec/models/name_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/name_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 0a06e9682ee..0963591fcc1 100644
--- a/samples/client/petstore/ruby/spec/models/number_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/number_only_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/order_spec.rb b/samples/client/petstore/ruby/spec/models/order_spec.rb
index fa3243537c0..3f1d973b275 100644
--- a/samples/client/petstore/ruby/spec/models/order_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/order_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 80b636a0e54..bb36f488959 100644
--- a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 bd722d47f46..ea9762da93b 100644
--- a/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/pet_spec.rb b/samples/client/petstore/ruby/spec/models/pet_spec.rb
index c2c85b82c27..dc0a0898c9f 100644
--- a/samples/client/petstore/ruby/spec/models/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/pet_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 4ab95118e9f..8d60e443313 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 8ca6493d9c8..b548f7f0951 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/tag_spec.rb b/samples/client/petstore/ruby/spec/models/tag_spec.rb
index f0eab291f5a..3a745439040 100644
--- a/samples/client/petstore/ruby/spec/models/tag_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/tag_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 1ebe43f7724..b7bf49dbca4 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 a54ea32230d..ba58952fcc3 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/user_spec.rb b/samples/client/petstore/ruby/spec/models/user_spec.rb
index 58cc20d1215..2eb31e993a0 100644
--- a/samples/client/petstore/ruby/spec/models/user_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/user_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 1054b841acb..8f300f2f8ad 100644
--- a/samples/client/petstore/ruby/spec/models/xml_item_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/xml_item_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb
index b61ebfca154..64dcf6b8f47 100644
--- a/samples/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/client/petstore/ruby/spec/spec_helper.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION
index e4955748d3e..d99e7162d01 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.2-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION
index a711b94f291..d99e7162d01 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION
@@ -1,9 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION
index a711b94f291..d99e7162d01 100644
--- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION
@@ -1,9 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION
index a711b94f291..d99e7162d01 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION
@@ -1,9 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go
index afb29fb8c43..83da6040263 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/client.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/client.go
@@ -353,6 +353,9 @@ func (c *APIClient) prepareRequest(
 }
 
 func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err error) {
+	if len(b) == 0 {
+		return nil
+	}
 	if s, ok := v.(*string); ok {
 		*s = string(b)
 		return nil
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 085e0ec51a7..f7ebb34cc98 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,15 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 90ff6b8ba51..f747862fb42 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,15 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 d50362da630..cf227d1c7b3 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,15 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 d32ffffe304..25ee8db1019 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,15 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 c6196c94847..49a00a98ae0 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,15 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 b6c572675c3..9e1ca342942 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,15 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 dac36452fa3..036f9d0fce7 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,15 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 d4300d7c1a6..67641db313c 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 11de6517ba1..22b4da20273 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 50546d9e41c..769fb143806 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 7f17f00feda..3888a2acbca 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 a50599af4ae..01739a814f1 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 dc4254c97a1..091dbcd8411 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 3f34937a46c..48852ba5569 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 06aff23ed36..93093478e70 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 76341ffb67b..53f1a0aa495 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 53a32989d00..ae8a8b25643 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 e75890dc8dd..cc76f2903b3 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 b08306cfd39..2cf80044760 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 25f085cc9fb..0f6f81ae75a 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 75fbdc86bf3..95946267855 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 b8440869f02..970a127d253 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 c869ee70647..79b5918d80a 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 39dd1c46159..65016c28606 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 f75a6631236..3cc7df9e6e3 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 c0547a7d17b..86b34f5ccad 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 b9d8fbb0f10..412b3004794 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 7bc9a2aec25..f4a2370d554 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 a01b7a7b447..68a4b0dc43a 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 a0e96d59515..b83b3727182 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 51c18fbb926..d5cd1a127c5 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 42cd05c3e8e..7d83b70298c 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 265ab6e30fa..663fc6976be 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 667554a3b34..3279f098efe 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 23e9c0f5635..6e0bfadae7a 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 845e3987097..6bad7ab2e1b 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 9eaebc76666..f4de899411b 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 c8e80f55af1..42ddddff86c 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 d385a14cbbb..d9c8a9bb5a2 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 279ed3201ae..5fcb6299065 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 47dfdc0c49a..f6fd81b3ca1 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 0e10a5ca647..4c9c784f628 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 3544a856298..02232a6d164 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 c8427da0a7a..71013973819 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 fd9d4944693..d89a2460ced 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 62b2c9ef276..aefed931c95 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 680b775a697..3d409221454 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 f160df3cda0..08cdb11cfb9 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 04e85dfa3dd..4594e35f956 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 f2c38378506..e1ad10bf286 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 e59f785f939..ac3865d7311 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 202083da76d..975ea9134d5 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 226585b6429..a3d27b5bd41 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 f8a03ef92e9..2b42e29c51a 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 ccad0a178b4..f375ba8096d 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 df5dcbdd55b..9672d99f1e7 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,15 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
  */
 
 /**
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 ba85c6e3f3c..bf187f0971f 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 849eb7fc84f..fd58eaa21a6 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 fd2248d226c..083a1c6ab70 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 709f74be6ec..1db2b3c9ef5 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 fae3e57680b..26ca32b2f75 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 e8bf668c36b..1fd9faf40aa 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 3f18d5f8916..39178c5a5ac 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 33ede96b49b..40811533188 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb b/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
index be549c30bc4..0bea24033c6 100644
--- a/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 c6a0b48b485..93a5b0d5fb4 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 886387d824c..8b3e9adc537 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 7bb27bc462f..628f1c4d7c1 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 9fd8b1dcf17..ea41c9a4b38 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 7a7ce9edcff..ba90932a797 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 c9309afc0b8..6ff7397ad43 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 029ad6883af..451c59af970 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 2d12de79ff1..926ce8a2a37 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 2a2d12469ff..3efb677ce64 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 76cd7315703..82ecd78d966 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 2d4b19e484c..761e8933127 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 c7d3f30c794..4bf1ce0622b 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 c5a90f6018d..5596927d423 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 2905492a554..b82df3e9d72 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 469000b386c..ac75c92581d 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 97a4dde432d..29fcd05aa75 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 f941b279847..7f4c9c97e87 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 bcc36bfe20a..8a8d92658c9 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 adbc136d4f1..b9d1499766e 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 12c728a81ef..46f8aa8a1d9 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 5f86929ddac..72fe239f298 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 be2313b3cc3..9efa03a22fe 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 cc56759d60c..e90a77ec8a7 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_object1_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_object1_spec.rb
index 2fa693e50c1..a702fd774ea 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/inline_object1_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_object1_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_object2_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_object2_spec.rb
index 81c4e66d682..7013915ea39 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/inline_object2_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_object2_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_object3_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_object3_spec.rb
index e48705131e4..4daf41b4ace 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/inline_object3_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_object3_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_object4_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_object4_spec.rb
index 3048ccc09c1..fa806f95860 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/inline_object4_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_object4_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_object5_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_object5_spec.rb
index 65c507c9047..e2410b21bc0 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/inline_object5_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_object5_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_object_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_object_spec.rb
index 56ebea5683c..c5a7db44780 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/inline_object_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_object_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 f28d0d9d341..812470131b9 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 6e5c2ba353a..db397aa108f 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 1cb78a21bfc..f7ff6788b09 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 0a6dbed9975..0e88f472524 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 47782594793..133f6b94c14 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 7b28f5bcf04..57d400eb116 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 aedde807f31..c882db4f221 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 caf5923232f..f1301d0a83d 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 0a06e9682ee..0963591fcc1 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 fa3243537c0..3f1d973b275 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 80b636a0e54..bb36f488959 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 7a2bf72d783..7bd96a7abaf 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 9d6135e0fbd..48a94827e56 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 1b7a86373c1..a0ac4c81f07 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 bd722d47f46..ea9762da93b 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 c2c85b82c27..dc0a0898c9f 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 4ab95118e9f..8d60e443313 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 8ca6493d9c8..b548f7f0951 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,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 f0eab291f5a..3a745439040 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =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 58cc20d1215..2eb31e993a0 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb b/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
index b61ebfca154..64dcf6b8f47 100644
--- a/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 
diff --git a/samples/server/petstore/go-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-api-server/.openapi-generator/VERSION
index a711b94f291..d99e7162d01 100644
--- a/samples/server/petstore/go-api-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/go-api-server/.openapi-generator/VERSION
@@ -1,9 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim4/.openapi-generator/VERSION b/samples/server/petstore/php-slim4/.openapi-generator/VERSION
index a711b94f291..d99e7162d01 100644
--- a/samples/server/petstore/php-slim4/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-slim4/.openapi-generator/VERSION
@@ -1,9 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
+5.0.0-SNAPSHOT
\ No newline at end of file