diff --git a/bin/openapi3/elm.sh b/bin/openapi3/elm.sh
index 9f7eba8ce3..dd4b0cc2c4 100755
--- a/bin/openapi3/elm.sh
+++ b/bin/openapi3/elm.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/3_0/elm.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/openapi3/client/elm $@"
+ags="generate -i modules/openapi-generator/src/test/resources/3_0/elm.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/openapi3/client/elm --skip-validate-spec $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/docs/generators/elm.md b/docs/generators/elm.md
index 978ad01b5b..f25c531062 100644
--- a/docs/generators/elm.md
+++ b/docs/generators/elm.md
@@ -5,13 +5,6 @@ sidebar_label: elm
 
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
-<<<<<<< HEAD
-=======
-|elmEnableCustomBasePaths|Enable setting the base path for each request| |false|
-|elmEnableHttpRequestTrackers|Enable adding a tracker to each http request| |false|
-|elmPrefixCustomTypeVariants|Prefix custom type variants| |false|
-|elmVersion|Elm version: 0.18, 0.19|<dl><dt>**0.19**</dt><dd>Elm 0.19</dd><dt>**0.18**</dt><dd>Elm 0.18</dd></dl>|0.19|
->>>>>>> origin/master
 
 ## IMPORT MAPPING
 
diff --git a/samples/client/petstore/R/.openapi-generator/VERSION b/samples/client/petstore/R/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/R/.openapi-generator/VERSION
+++ b/samples/client/petstore/R/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/apex/.openapi-generator/VERSION b/samples/client/petstore/apex/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/apex/.openapi-generator/VERSION
+++ b/samples/client/petstore/apex/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/apex/README.md b/samples/client/petstore/apex/README.md
index a1481aea07..45720bb0ab 100644
--- a/samples/client/petstore/apex/README.md
+++ b/samples/client/petstore/apex/README.md
@@ -1,12 +1,12 @@
 # OpenAPI Petstore API Client
 
+
 This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 
 ## Requirements
 
 - [Salesforce DX](https://www.salesforce.com/products/platform/products/salesforce-dx/)
 
-
 If everything is set correctly:
 
 - Running `sfdx version` in a command prompt should output something like:
@@ -15,28 +15,28 @@ If everything is set correctly:
   sfdx-cli/5.7.5-05549de (darwin-amd64) go1.7.5 sfdxstable
   ```
 
-
 ## Installation
 
 1. Copy the output into your Salesforce DX folder - or alternatively deploy the output directly into the workspace.
 2. Deploy the code via Salesforce DX to your Scratch Org
 
    ```bash
-   $ sfdx force:source:push
+      sfdx force:source:push
    ```
+
 3. If the API needs authentication update the Named Credential in Setup.
 4. Run your Apex tests using
 
-    ```bash
-    $ sfdx sfdx force:apex:test:run
-    ```
+   ```bash
+       sfdx sfdx force:apex:test:run
+   ```
+
 5. Retrieve the job id from the console and check the test results.
 
   ```bash
-  $ sfdx force:apex:test:report -i theJobId
+  sfdx force:apex:test:report -i theJobId
   ```
 
-
 ## Getting Started
 
 Please follow the [installation](#installation) instruction and execute the following Apex code:
@@ -47,7 +47,7 @@ OASClient client = api.getClient();
 
 
 Map<String, Object> params = new Map<String, Object>{
-    'oaSPet' => OASPet.getExample()
+    'body' => ''
 };
 
 try {
@@ -101,6 +101,7 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
diff --git a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION
index b5d898602c..d99e7162d0 100644
--- a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION
+++ b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp
index 05b515d605..c140cd463d 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiClient.h b/samples/client/petstore/cpp-restsdk/client/ApiClient.h
index d8ef81395a..12cc09eabf 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiClient.h
+++ b/samples/client/petstore/cpp-restsdk/client/ApiClient.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp
index fb1219dfd6..2d8d632e78 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h
index a7954afe9f..e10806de93 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h
+++ b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiException.cpp b/samples/client/petstore/cpp-restsdk/client/ApiException.cpp
index 90e2f3a02d..b0fbc3c990 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiException.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ApiException.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiException.h b/samples/client/petstore/cpp-restsdk/client/ApiException.h
index 0f90da0125..9947a7565e 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiException.h
+++ b/samples/client/petstore/cpp-restsdk/client/ApiException.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp
index dbcc4c36f5..e2369d30a2 100644
--- a/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/HttpContent.h b/samples/client/petstore/cpp-restsdk/client/HttpContent.h
index d99226b5f9..8b2546c811 100644
--- a/samples/client/petstore/cpp-restsdk/client/HttpContent.h
+++ b/samples/client/petstore/cpp-restsdk/client/HttpContent.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/IHttpBody.h b/samples/client/petstore/cpp-restsdk/client/IHttpBody.h
index 8c1ecfaf6a..34fc5b265d 100644
--- a/samples/client/petstore/cpp-restsdk/client/IHttpBody.h
+++ b/samples/client/petstore/cpp-restsdk/client/IHttpBody.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp
index a511b429c7..b9965b72dc 100644
--- a/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/JsonBody.h b/samples/client/petstore/cpp-restsdk/client/JsonBody.h
index 763b796630..52e19df154 100644
--- a/samples/client/petstore/cpp-restsdk/client/JsonBody.h
+++ b/samples/client/petstore/cpp-restsdk/client/JsonBody.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
index 67fab20d52..0c55be94d8 100644
--- a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.h b/samples/client/petstore/cpp-restsdk/client/ModelBase.h
index 9cfc7d0376..6304adf32e 100644
--- a/samples/client/petstore/cpp-restsdk/client/ModelBase.h
+++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp
index a7c01c32fe..46d8885509 100644
--- a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h
index e0b0ecf65b..6364bb4e0c 100644
--- a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h
+++ b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/Object.cpp b/samples/client/petstore/cpp-restsdk/client/Object.cpp
index 29927bc38d..e474fa4446 100644
--- a/samples/client/petstore/cpp-restsdk/client/Object.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/Object.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/Object.h b/samples/client/petstore/cpp-restsdk/client/Object.h
index 000ab40c59..c91c471132 100644
--- a/samples/client/petstore/cpp-restsdk/client/Object.h
+++ b/samples/client/petstore/cpp-restsdk/client/Object.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp
index 10250828ac..00148c091a 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h
index 86b3082253..c4956f5eec 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h
+++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp
index 036832c84f..5bdc44a2f0 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h
index cd2aeb80e5..f323827a0f 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h
+++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp
index 66cae70d5d..75f9876cc6 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h
index c9023c9b11..04a0036b5f 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h
+++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp
index f62696772a..7190eddb6c 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h
index ab38b69197..4d6b72483e 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Category.cpp b/samples/client/petstore/cpp-restsdk/client/model/Category.cpp
index bb03d5e091..663f71dbc9 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Category.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/Category.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Category.h b/samples/client/petstore/cpp-restsdk/client/model/Category.h
index bfef8349fb..6339dff505 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Category.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/Category.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Order.cpp b/samples/client/petstore/cpp-restsdk/client/model/Order.cpp
index 1ba0c589fa..bd2e969c1d 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Order.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/Order.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Order.h b/samples/client/petstore/cpp-restsdk/client/model/Order.h
index 627036b9be..9c93671062 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Order.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/Order.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp
index ee42378128..69a21367db 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Pet.h b/samples/client/petstore/cpp-restsdk/client/model/Pet.h
index e8b91d65af..55b37460fa 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Pet.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/Pet.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp
index 2982c30998..2fcc5ea3c1 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Tag.h b/samples/client/petstore/cpp-restsdk/client/model/Tag.h
index 6eeb1df883..47f2c315b4 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Tag.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/Tag.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/User.cpp b/samples/client/petstore/cpp-restsdk/client/model/User.cpp
index 9070d0bf63..18a739cefc 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/User.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/User.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/User.h b/samples/client/petstore/cpp-restsdk/client/model/User.h
index aef733b82a..5f5ee9e129 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/User.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/User.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION b/samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart/openapi/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/dart/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart/openapi/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
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 ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/elixir/.openapi-generator/VERSION b/samples/client/petstore/elixir/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/elixir/.openapi-generator/VERSION
+++ b/samples/client/petstore/elixir/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
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 ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
+++ b/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/go/go-petstore-withXml/.openapi-generator/VERSION b/samples/client/petstore/go/go-petstore-withXml/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/go/go-petstore-withXml/.openapi-generator/VERSION
+++ b/samples/client/petstore/go/go-petstore-withXml/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION
+++ b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/groovy/.openapi-generator/VERSION b/samples/client/petstore/groovy/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/groovy/.openapi-generator/VERSION
+++ b/samples/client/petstore/groovy/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/feign/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign10x/.openapi-generator/VERSION b/samples/client/petstore/java/feign10x/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/feign10x/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/feign10x/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign10x/README.md b/samples/client/petstore/java/feign10x/README.md
index 646dfdc4e2..ab3a76ba39 100644
--- a/samples/client/petstore/java/feign10x/README.md
+++ b/samples/client/petstore/java/feign10x/README.md
@@ -1,4 +1,4 @@
-# petstore-feign
+# petstore-feign-10x
 
 ## Requirements
 
@@ -25,7 +25,7 @@ After the client library is installed/deployed, you can use it in your Maven pro
 ```xml
 <dependency>
     <groupId>org.openapitools</groupId>
-    <artifactId>petstore-feign</artifactId>
+    <artifactId>petstore-feign-10x</artifactId>
     <version>1.0.0</version>
     <scope>compile</scope>
 </dependency>
diff --git a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/google-api-client/README.md b/samples/client/petstore/java/google-api-client/README.md
index 9d122f21f9..a72fd4e474 100644
--- a/samples/client/petstore/java/google-api-client/README.md
+++ b/samples/client/petstore/java/google-api-client/README.md
@@ -1,6 +1,7 @@
 # petstore-google-api-client
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-google-api-client-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-google-api-client-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey1/README.md b/samples/client/petstore/java/jersey1/README.md
index 01f0c95235..f57457ded3 100644
--- a/samples/client/petstore/java/jersey1/README.md
+++ b/samples/client/petstore/java/jersey1/README.md
@@ -1,6 +1,7 @@
 # petstore-java-client-jersey1
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-java-client-jersey1-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-java-client-jersey1-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java6/README.md b/samples/client/petstore/java/jersey2-java6/README.md
index ba58700f55..6b7be6d30a 100644
--- a/samples/client/petstore/java/jersey2-java6/README.md
+++ b/samples/client/petstore/java/jersey2-java6/README.md
@@ -1,6 +1,7 @@
 # petstore-jersey2-java6
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.6+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-jersey2-java6-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-jersey2-java6-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,7 +106,8 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
@@ -111,10 +115,12 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -141,18 +147,28 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
@@ -172,9 +188,11 @@ Class | Method | HTTP request | Description
  - [Pet](docs/Pet.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
- - [StringBooleanMap](docs/StringBooleanMap.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -182,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/jersey2-java6/build.gradle b/samples/client/petstore/java/jersey2-java6/build.gradle
index d540a137bd..3c60f38a12 100644
--- a/samples/client/petstore/java/jersey2-java6/build.gradle
+++ b/samples/client/petstore/java/jersey2-java6/build.gradle
@@ -6,9 +6,8 @@ version = '1.0.0'
 
 buildscript {
     repositories {
-        jcenter {
-            url "https://jcenter.bintray.com/"
-        }
+        maven { url "https://repo1.maven.org/maven2" }
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
@@ -17,9 +16,7 @@ buildscript {
 }
 
 repositories {
-    jcenter {
-        url "http://jcenter.bintray.com/"
-    }
+    jcenter()
 }
 
 
@@ -97,26 +94,34 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.20"
-    jackson_version = "2.9.6"
+    swagger_annotations_version = "1.5.22"
+    jackson_version = "2.10.3"
+    jackson_databind_version = "2.10.3"
+    jackson_databind_nullable_version = "0.2.1"
     jersey_version = "2.6"
     commons_io_version=2.5
     commons_lang3_version=3.6
     junit_version = "4.13"
-    threetenbp_version = "2.6.4"
+    threetenbp_version = "2.9.10"
 }
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
+    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "commons-io:commons-io:$commons_io_version"
     compile "org.apache.commons:commons-lang3:$commons_lang3_version"
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }
+
+javadoc {
+    options.tags = [ "http.response.details:a:Http Response Details" ]
+}
diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java8/README.md b/samples/client/petstore/java/jersey2-java8/README.md
index e0bc857975..634f09c316 100644
--- a/samples/client/petstore/java/jersey2-java8/README.md
+++ b/samples/client/petstore/java/jersey2-java8/README.md
@@ -1,6 +1,7 @@
 # petstore-jersey2-java8
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.8+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-jersey2-java8-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-jersey2-java8-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2/README.md b/samples/client/petstore/java/jersey2/README.md
index 2fa784e726..a42ed132fe 100644
--- a/samples/client/petstore/java/jersey2/README.md
+++ b/samples/client/petstore/java/jersey2/README.md
@@ -1,6 +1,7 @@
 # petstore-jersey2
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-jersey2-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-jersey2-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/native/.openapi-generator/VERSION b/samples/client/petstore/java/native/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/native/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/native/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/native/README.md b/samples/client/petstore/java/native/README.md
index 6c5f47c0eb..95bf0640c9 100644
--- a/samples/client/petstore/java/native/README.md
+++ b/samples/client/petstore/java/native/README.md
@@ -114,11 +114,12 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
 *FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -157,6 +158,8 @@ Class | Method | HTTP request | Description
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
  - [CatAllOf](docs/CatAllOf.md)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/README.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/README.md
index 95451bb224..940c1f1620 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/README.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/README.md
@@ -71,28 +71,31 @@ Please follow the [installation](#installation) instruction and execute the foll
 
 ```java
 
-import org.openapitools.client.*;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.model.*;
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
-public class AnotherFakeApiExample {
-
-    public static void main(String[] args) {
-        
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.testSpecialTags(client);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
-            e.printStackTrace();
-        }
+    AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+    Client body = new Client(); // Client | client model
+    try {
+      Client result = apiInstance.call123testSpecialTags(body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
     }
+  }
 }
 
 ```
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/README.md b/samples/client/petstore/java/okhttp-gson/README.md
index efdd9c895c..68964ee245 100644
--- a/samples/client/petstore/java/okhttp-gson/README.md
+++ b/samples/client/petstore/java/okhttp-gson/README.md
@@ -71,28 +71,31 @@ Please follow the [installation](#installation) instruction and execute the foll
 
 ```java
 
-import org.openapitools.client.*;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.model.*;
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
-public class AnotherFakeApiExample {
-
-    public static void main(String[] args) {
-        
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.testSpecialTags(client);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
-            e.printStackTrace();
-        }
+    AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+    Client body = new Client(); // Client | client model
+    try {
+      Client result = apiInstance.call123testSpecialTags(body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
     }
+  }
 }
 
 ```
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resteasy/README.md b/samples/client/petstore/java/resteasy/README.md
index d13c28ec02..6a6d3e6b69 100644
--- a/samples/client/petstore/java/resteasy/README.md
+++ b/samples/client/petstore/java/resteasy/README.md
@@ -1,6 +1,7 @@
 # petstore-resteasy
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-resteasy-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-resteasy-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate-withXml/README.md b/samples/client/petstore/java/resttemplate-withXml/README.md
index 4e455c37b6..419778f2cc 100644
--- a/samples/client/petstore/java/resttemplate-withXml/README.md
+++ b/samples/client/petstore/java/resttemplate-withXml/README.md
@@ -1,6 +1,7 @@
-# pestore-resttemplate-withxml
+# petstore-resttemplate-withxml
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -38,7 +39,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
   <groupId>org.openapitools</groupId>
-  <artifactId>pestore-resttemplate-withxml</artifactId>
+  <artifactId>petstore-resttemplate-withxml</artifactId>
   <version>1.0.0</version>
   <scope>compile</scope>
 </dependency>
@@ -49,7 +50,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "org.openapitools:pestore-resttemplate-withxml:1.0.0"
+compile "org.openapitools:petstore-resttemplate-withxml:1.0.0"
 ```
 
 ### Others
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/pestore-resttemplate-withxml-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-resttemplate-withxml-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate/README.md b/samples/client/petstore/java/resttemplate/README.md
index 1d1e105954..7d14624163 100644
--- a/samples/client/petstore/java/resttemplate/README.md
+++ b/samples/client/petstore/java/resttemplate/README.md
@@ -1,6 +1,7 @@
 # petstore-resttemplate
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -26,7 +27,7 @@ mvn clean install
 To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
 
 ```shell
-mvn clean deploy 
+mvn clean deploy
 ```
 
 Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-resttemplate-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-resttemplate-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/vertx/README.md b/samples/client/petstore/java/vertx/README.md
index 2f8d312a1e..9dff28d22c 100644
--- a/samples/client/petstore/java/vertx/README.md
+++ b/samples/client/petstore/java/vertx/README.md
@@ -1,6 +1,7 @@
 # petstore-vertx
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.8+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-vertx-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-vertx-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/webclient/README.md b/samples/client/petstore/java/webclient/README.md
index 75b407620d..d400f7f119 100644
--- a/samples/client/petstore/java/webclient/README.md
+++ b/samples/client/petstore/java/webclient/README.md
@@ -1,6 +1,7 @@
 # petstore-webclient
 
 OpenAPI Petstore
+
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.8+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-webclient-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/petstore-webclient-1.0.0.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client client = new Client(); // Client | client model
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -140,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,9 +188,11 @@ Class | Method | HTTP request | Description
  - [Pet](docs/Pet.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
- - [StringBooleanMap](docs/StringBooleanMap.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -180,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise/src/ApiClient.js b/samples/client/petstore/javascript-promise/src/ApiClient.js
index cf7b857557..44237677d2 100644
--- a/samples/client/petstore/javascript-promise/src/ApiClient.js
+++ b/samples/client/petstore/javascript-promise/src/ApiClient.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
index 003ebefb60..e6cbc4e382 100644
--- a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/FakeApi.js b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
index a2b0223a21..6ba7dcd543 100644
--- a/samples/client/petstore/javascript-promise/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
index 638b3213f9..eae522bf63 100644
--- a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/PetApi.js b/samples/client/petstore/javascript-promise/src/api/PetApi.js
index 4d602fef97..c50e428399 100644
--- a/samples/client/petstore/javascript-promise/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/PetApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/StoreApi.js b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
index ab69c432c2..eb7d5a60a6 100644
--- a/samples/client/petstore/javascript-promise/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/UserApi.js b/samples/client/petstore/javascript-promise/src/api/UserApi.js
index 7bf3680b1d..fb070a51ef 100644
--- a/samples/client/petstore/javascript-promise/src/api/UserApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/UserApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/index.js b/samples/client/petstore/javascript-promise/src/index.js
index ff180246a5..a1defd20ce 100644
--- a/samples/client/petstore/javascript-promise/src/index.js
+++ b/samples/client/petstore/javascript-promise/src/index.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js
index 5da523d1ed..9774ac3399 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js
index 4deff93567..44c2f9b390 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js
index b3ad5bb9ea..c1ad7844f5 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
index 9c2d4315f6..2b19a95b48 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js
index d6dc7456c1..295febe364 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js
index 4cdb4d9ab3..f0b20ec0bb 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js
index b1a51a22ff..e219405155 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js
index 0727b14e7e..ce82a0e752 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Animal.js b/samples/client/petstore/javascript-promise/src/model/Animal.js
index f22cb223c7..b46bc005c7 100644
--- a/samples/client/petstore/javascript-promise/src/model/Animal.js
+++ b/samples/client/petstore/javascript-promise/src/model/Animal.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
index e7a3b4eae5..5e9e0b16ee 100644
--- a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
index 83abc524c2..13cae7cf90 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
index e677f51455..a2a51049e7 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
index a119ac65c9..78739e4a4d 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/BigCat.js b/samples/client/petstore/javascript-promise/src/model/BigCat.js
index 1a2f477ab4..7c2e8079c3 100644
--- a/samples/client/petstore/javascript-promise/src/model/BigCat.js
+++ b/samples/client/petstore/javascript-promise/src/model/BigCat.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/BigCatAllOf.js b/samples/client/petstore/javascript-promise/src/model/BigCatAllOf.js
index 3556832067..e9ee15fdc8 100644
--- a/samples/client/petstore/javascript-promise/src/model/BigCatAllOf.js
+++ b/samples/client/petstore/javascript-promise/src/model/BigCatAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Capitalization.js b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
index 3099f56337..ed0dc0b616 100644
--- a/samples/client/petstore/javascript-promise/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Cat.js b/samples/client/petstore/javascript-promise/src/model/Cat.js
index f7b43a4c77..fcc9e7bf67 100644
--- a/samples/client/petstore/javascript-promise/src/model/Cat.js
+++ b/samples/client/petstore/javascript-promise/src/model/Cat.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/CatAllOf.js b/samples/client/petstore/javascript-promise/src/model/CatAllOf.js
index f12d2bede6..78465ea099 100644
--- a/samples/client/petstore/javascript-promise/src/model/CatAllOf.js
+++ b/samples/client/petstore/javascript-promise/src/model/CatAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Category.js b/samples/client/petstore/javascript-promise/src/model/Category.js
index 4ff60dd904..1093447028 100644
--- a/samples/client/petstore/javascript-promise/src/model/Category.js
+++ b/samples/client/petstore/javascript-promise/src/model/Category.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ClassModel.js b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
index bf777d465f..47e80df542 100644
--- a/samples/client/petstore/javascript-promise/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Client.js b/samples/client/petstore/javascript-promise/src/model/Client.js
index 3f4a38837a..ea7bfcafba 100644
--- a/samples/client/petstore/javascript-promise/src/model/Client.js
+++ b/samples/client/petstore/javascript-promise/src/model/Client.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Dog.js b/samples/client/petstore/javascript-promise/src/model/Dog.js
index a4516dd4d0..f69a203858 100644
--- a/samples/client/petstore/javascript-promise/src/model/Dog.js
+++ b/samples/client/petstore/javascript-promise/src/model/Dog.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/DogAllOf.js b/samples/client/petstore/javascript-promise/src/model/DogAllOf.js
index 7269429920..a531669f53 100644
--- a/samples/client/petstore/javascript-promise/src/model/DogAllOf.js
+++ b/samples/client/petstore/javascript-promise/src/model/DogAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
index dfa018dc9e..78fe939c4b 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumClass.js b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
index fe0bf34c40..d4f668246b 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumTest.js b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
index 9408127775..997ac55f5d 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/File.js b/samples/client/petstore/javascript-promise/src/model/File.js
index 9686abbbf8..109a6e5526 100644
--- a/samples/client/petstore/javascript-promise/src/model/File.js
+++ b/samples/client/petstore/javascript-promise/src/model/File.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
index 4efda952a5..22f10496e4 100644
--- a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/FormatTest.js b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
index 5792590caf..63b987b439 100644
--- a/samples/client/petstore/javascript-promise/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
index aef5d901f6..a48fa374d9 100644
--- a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/List.js b/samples/client/petstore/javascript-promise/src/model/List.js
index 0961a41acd..d27fdd125e 100644
--- a/samples/client/petstore/javascript-promise/src/model/List.js
+++ b/samples/client/petstore/javascript-promise/src/model/List.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/MapTest.js b/samples/client/petstore/javascript-promise/src/model/MapTest.js
index 53d5d49292..aa9a1a5b4e 100644
--- a/samples/client/petstore/javascript-promise/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/MapTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index afb1e38a6b..bc98f6da1f 100644
--- a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Model200Response.js b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
index 67f7d445f6..6ded236af2 100644
--- a/samples/client/petstore/javascript-promise/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
index e694281d37..1d19b387c3 100644
--- a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Name.js b/samples/client/petstore/javascript-promise/src/model/Name.js
index 43820ebbc2..c3e29dd84f 100644
--- a/samples/client/petstore/javascript-promise/src/model/Name.js
+++ b/samples/client/petstore/javascript-promise/src/model/Name.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
index c149a66e26..a51aff7a97 100644
--- a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Order.js b/samples/client/petstore/javascript-promise/src/model/Order.js
index d6b646b567..20f551b4e2 100644
--- a/samples/client/petstore/javascript-promise/src/model/Order.js
+++ b/samples/client/petstore/javascript-promise/src/model/Order.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
index ea06fdf027..2197245f64 100644
--- a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
index 0c19fb6a00..ef94683a82 100644
--- a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Pet.js b/samples/client/petstore/javascript-promise/src/model/Pet.js
index 14f8d728f8..5f5c3e2b6f 100644
--- a/samples/client/petstore/javascript-promise/src/model/Pet.js
+++ b/samples/client/petstore/javascript-promise/src/model/Pet.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
index 8300189622..e5e7a71b4b 100644
--- a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
index 912bc35227..2ebce770f7 100644
--- a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Tag.js b/samples/client/petstore/javascript-promise/src/model/Tag.js
index 2b4d39702a..64a07da1a7 100644
--- a/samples/client/petstore/javascript-promise/src/model/Tag.js
+++ b/samples/client/petstore/javascript-promise/src/model/Tag.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js b/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js
index 1ab260098a..73386a8433 100644
--- a/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js
+++ b/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js b/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js
index 1136685c3a..b06faabd66 100644
--- a/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js
+++ b/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/User.js b/samples/client/petstore/javascript-promise/src/model/User.js
index e5edc2ec7e..967d15b018 100644
--- a/samples/client/petstore/javascript-promise/src/model/User.js
+++ b/samples/client/petstore/javascript-promise/src/model/User.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/XmlItem.js b/samples/client/petstore/javascript-promise/src/model/XmlItem.js
index 9d496ce83b..244eb73f03 100644
--- a/samples/client/petstore/javascript-promise/src/model/XmlItem.js
+++ b/samples/client/petstore/javascript-promise/src/model/XmlItem.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/.openapi-generator/VERSION b/samples/client/petstore/javascript/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/javascript/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js
index 7bd7cf9f43..298e4abb7e 100644
--- a/samples/client/petstore/javascript/src/ApiClient.js
+++ b/samples/client/petstore/javascript/src/ApiClient.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
index 01e927ed79..54709c871e 100644
--- a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/FakeApi.js b/samples/client/petstore/javascript/src/api/FakeApi.js
index 60f9b64c3d..9512f4d082 100644
--- a/samples/client/petstore/javascript/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript/src/api/FakeApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
index 2fa9fbf0c5..8ef462bffc 100644
--- a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/PetApi.js b/samples/client/petstore/javascript/src/api/PetApi.js
index e4ea31dc77..7af853c712 100644
--- a/samples/client/petstore/javascript/src/api/PetApi.js
+++ b/samples/client/petstore/javascript/src/api/PetApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/StoreApi.js b/samples/client/petstore/javascript/src/api/StoreApi.js
index 6c7fb3d6b4..11ba830249 100644
--- a/samples/client/petstore/javascript/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript/src/api/StoreApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/UserApi.js b/samples/client/petstore/javascript/src/api/UserApi.js
index 772a77f94c..a92872f7a3 100644
--- a/samples/client/petstore/javascript/src/api/UserApi.js
+++ b/samples/client/petstore/javascript/src/api/UserApi.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js
index ff180246a5..a1defd20ce 100644
--- a/samples/client/petstore/javascript/src/index.js
+++ b/samples/client/petstore/javascript/src/index.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js
index 5da523d1ed..9774ac3399 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js
index 4deff93567..44c2f9b390 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js
index b3ad5bb9ea..c1ad7844f5 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
index 9c2d4315f6..2b19a95b48 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js
index d6dc7456c1..295febe364 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js
index 4cdb4d9ab3..f0b20ec0bb 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js
index b1a51a22ff..e219405155 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js
index 0727b14e7e..ce82a0e752 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js
index f22cb223c7..b46bc005c7 100644
--- a/samples/client/petstore/javascript/src/model/Animal.js
+++ b/samples/client/petstore/javascript/src/model/Animal.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ApiResponse.js b/samples/client/petstore/javascript/src/model/ApiResponse.js
index e7a3b4eae5..5e9e0b16ee 100644
--- a/samples/client/petstore/javascript/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript/src/model/ApiResponse.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
index 83abc524c2..13cae7cf90 100644
--- a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
index e677f51455..a2a51049e7 100644
--- a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ArrayTest.js b/samples/client/petstore/javascript/src/model/ArrayTest.js
index a119ac65c9..78739e4a4d 100644
--- a/samples/client/petstore/javascript/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript/src/model/ArrayTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/BigCat.js b/samples/client/petstore/javascript/src/model/BigCat.js
index 1a2f477ab4..7c2e8079c3 100644
--- a/samples/client/petstore/javascript/src/model/BigCat.js
+++ b/samples/client/petstore/javascript/src/model/BigCat.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/BigCatAllOf.js b/samples/client/petstore/javascript/src/model/BigCatAllOf.js
index 3556832067..e9ee15fdc8 100644
--- a/samples/client/petstore/javascript/src/model/BigCatAllOf.js
+++ b/samples/client/petstore/javascript/src/model/BigCatAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Capitalization.js b/samples/client/petstore/javascript/src/model/Capitalization.js
index 3099f56337..ed0dc0b616 100644
--- a/samples/client/petstore/javascript/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript/src/model/Capitalization.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Cat.js b/samples/client/petstore/javascript/src/model/Cat.js
index f7b43a4c77..fcc9e7bf67 100644
--- a/samples/client/petstore/javascript/src/model/Cat.js
+++ b/samples/client/petstore/javascript/src/model/Cat.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/CatAllOf.js b/samples/client/petstore/javascript/src/model/CatAllOf.js
index f12d2bede6..78465ea099 100644
--- a/samples/client/petstore/javascript/src/model/CatAllOf.js
+++ b/samples/client/petstore/javascript/src/model/CatAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js
index 4ff60dd904..1093447028 100644
--- a/samples/client/petstore/javascript/src/model/Category.js
+++ b/samples/client/petstore/javascript/src/model/Category.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ClassModel.js b/samples/client/petstore/javascript/src/model/ClassModel.js
index bf777d465f..47e80df542 100644
--- a/samples/client/petstore/javascript/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript/src/model/ClassModel.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Client.js b/samples/client/petstore/javascript/src/model/Client.js
index 3f4a38837a..ea7bfcafba 100644
--- a/samples/client/petstore/javascript/src/model/Client.js
+++ b/samples/client/petstore/javascript/src/model/Client.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Dog.js b/samples/client/petstore/javascript/src/model/Dog.js
index a4516dd4d0..f69a203858 100644
--- a/samples/client/petstore/javascript/src/model/Dog.js
+++ b/samples/client/petstore/javascript/src/model/Dog.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/DogAllOf.js b/samples/client/petstore/javascript/src/model/DogAllOf.js
index 7269429920..a531669f53 100644
--- a/samples/client/petstore/javascript/src/model/DogAllOf.js
+++ b/samples/client/petstore/javascript/src/model/DogAllOf.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumArrays.js b/samples/client/petstore/javascript/src/model/EnumArrays.js
index dfa018dc9e..78fe939c4b 100644
--- a/samples/client/petstore/javascript/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript/src/model/EnumArrays.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumClass.js b/samples/client/petstore/javascript/src/model/EnumClass.js
index fe0bf34c40..d4f668246b 100644
--- a/samples/client/petstore/javascript/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript/src/model/EnumClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumTest.js b/samples/client/petstore/javascript/src/model/EnumTest.js
index 9408127775..997ac55f5d 100644
--- a/samples/client/petstore/javascript/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript/src/model/EnumTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/File.js b/samples/client/petstore/javascript/src/model/File.js
index 9686abbbf8..109a6e5526 100644
--- a/samples/client/petstore/javascript/src/model/File.js
+++ b/samples/client/petstore/javascript/src/model/File.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
index 4efda952a5..22f10496e4 100644
--- a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
+++ b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/FormatTest.js b/samples/client/petstore/javascript/src/model/FormatTest.js
index 5792590caf..63b987b439 100644
--- a/samples/client/petstore/javascript/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript/src/model/FormatTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
index aef5d901f6..a48fa374d9 100644
--- a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/List.js b/samples/client/petstore/javascript/src/model/List.js
index 0961a41acd..d27fdd125e 100644
--- a/samples/client/petstore/javascript/src/model/List.js
+++ b/samples/client/petstore/javascript/src/model/List.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/MapTest.js b/samples/client/petstore/javascript/src/model/MapTest.js
index 53d5d49292..aa9a1a5b4e 100644
--- a/samples/client/petstore/javascript/src/model/MapTest.js
+++ b/samples/client/petstore/javascript/src/model/MapTest.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index afb1e38a6b..bc98f6da1f 100644
--- a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Model200Response.js b/samples/client/petstore/javascript/src/model/Model200Response.js
index 67f7d445f6..6ded236af2 100644
--- a/samples/client/petstore/javascript/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript/src/model/Model200Response.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ModelReturn.js b/samples/client/petstore/javascript/src/model/ModelReturn.js
index e694281d37..1d19b387c3 100644
--- a/samples/client/petstore/javascript/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript/src/model/ModelReturn.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js
index 43820ebbc2..c3e29dd84f 100644
--- a/samples/client/petstore/javascript/src/model/Name.js
+++ b/samples/client/petstore/javascript/src/model/Name.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/NumberOnly.js b/samples/client/petstore/javascript/src/model/NumberOnly.js
index c149a66e26..a51aff7a97 100644
--- a/samples/client/petstore/javascript/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/NumberOnly.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Order.js b/samples/client/petstore/javascript/src/model/Order.js
index d6b646b567..20f551b4e2 100644
--- a/samples/client/petstore/javascript/src/model/Order.js
+++ b/samples/client/petstore/javascript/src/model/Order.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/OuterComposite.js b/samples/client/petstore/javascript/src/model/OuterComposite.js
index ea06fdf027..2197245f64 100644
--- a/samples/client/petstore/javascript/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript/src/model/OuterComposite.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/OuterEnum.js b/samples/client/petstore/javascript/src/model/OuterEnum.js
index 0c19fb6a00..ef94683a82 100644
--- a/samples/client/petstore/javascript/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript/src/model/OuterEnum.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Pet.js b/samples/client/petstore/javascript/src/model/Pet.js
index 14f8d728f8..5f5c3e2b6f 100644
--- a/samples/client/petstore/javascript/src/model/Pet.js
+++ b/samples/client/petstore/javascript/src/model/Pet.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
index 8300189622..e5e7a71b4b 100644
--- a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/SpecialModelName.js b/samples/client/petstore/javascript/src/model/SpecialModelName.js
index 912bc35227..2ebce770f7 100644
--- a/samples/client/petstore/javascript/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript/src/model/SpecialModelName.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js
index 2b4d39702a..64a07da1a7 100644
--- a/samples/client/petstore/javascript/src/model/Tag.js
+++ b/samples/client/petstore/javascript/src/model/Tag.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/TypeHolderDefault.js b/samples/client/petstore/javascript/src/model/TypeHolderDefault.js
index 1ab260098a..73386a8433 100644
--- a/samples/client/petstore/javascript/src/model/TypeHolderDefault.js
+++ b/samples/client/petstore/javascript/src/model/TypeHolderDefault.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/TypeHolderExample.js b/samples/client/petstore/javascript/src/model/TypeHolderExample.js
index 1136685c3a..b06faabd66 100644
--- a/samples/client/petstore/javascript/src/model/TypeHolderExample.js
+++ b/samples/client/petstore/javascript/src/model/TypeHolderExample.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js
index e5edc2ec7e..967d15b018 100644
--- a/samples/client/petstore/javascript/src/model/User.js
+++ b/samples/client/petstore/javascript/src/model/User.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/XmlItem.js b/samples/client/petstore/javascript/src/model/XmlItem.js
index 9d496ce83b..244eb73f03 100644
--- a/samples/client/petstore/javascript/src/model/XmlItem.js
+++ b/samples/client/petstore/javascript/src/model/XmlItem.js
@@ -7,11 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION
index b5d898602c..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+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 ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+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 ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+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 ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/kotlin/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+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 ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/nim/.openapi-generator/VERSION
+++ b/samples/client/petstore/nim/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/perl/.openapi-generator/VERSION b/samples/client/petstore/perl/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/perl/.openapi-generator/VERSION
+++ b/samples/client/petstore/perl/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
+++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index bda7a61570..8c4d7b4138 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index ed20b6cfd7..816a49f337 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 7294cce4ed..309dc0849f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index 23ff582fdc..6c5534fbc4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index 87ac60f5c5..2d12dae01a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index c3672ba677..f6ba1fa740 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index 9643538a28..83dd6134b7 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index f925ddb36b..5942ddea29 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index c08e13912b..1ebf4547a4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
index 9ece15543f..65bc49f732 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
index 65e4a146f2..d408428d78 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
index 137a513228..815fb828c8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index cfa532f1ea..3dd4d15fd3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
index a2b4968cf0..530b03800d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
index aa3b104b54..2c3b9c7a3e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
index 555c0b2f46..a584aa2452 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
index e9632243fe..9ca047ee12 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index c7efce4ff7..db94841581 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index b49068d1c7..9b72d9ffe5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index dcec81a09e..11244ecfb2 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 76e78320e2..32c44dd7df 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index 421a242a5f..011f4a5e87 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCat.php
index ea6d8dd1b5..56358b13b4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCat.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCat.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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCatAllOf.php
index eb2651334f..9fd9b87b6f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCatAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCatAllOf.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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index e48a7b706b..fee455fefb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index b1209c926f..ea464ecb3d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
index 0c9d181d8c..af85243996 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index bf270280bc..73864723cc 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index cb700028c9..0fc47ff254 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index 42814c8f38..a458462807 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index 17b44a8d1a..de27e21800 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
index 978bc6f636..90d3768d64 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index 7b4287672e..a18c5b38c0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index c855b2a942..4821949ea0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index 842d756e01..0bedaa28cd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index 7edcd141a6..d660108328 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index c2509bae29..27324041b2 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index b3bc190167..d625375e49 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index 6f2db7e9d4..5d0fac0c83 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 6d6e57065b..77e3656df5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 5d69a3c7d4..7e05ebd490 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index 60c947675a..4627a69ab5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index ae75e849e5..79bcab1ca9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index 178c01fc45..8bfec03077 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index 34511f5924..5661524ff9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index 81e39fca17..490c760977 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index 6a1172a3c0..17f4844d3b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index 3a88fd3d92..2fc6eaa6c8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index 8970731b14..fc26df1dd1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index 569924a8b2..84e8aa7520 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index 49bed75f0b..c3cde4e2da 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index b1f6bb7cbb..32db4a5195 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index a050bf6f7f..cbe57ec720 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 6f0fe496cb..b04e3a085d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
index b95892ba96..73b8a09f56 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
index 0e9cfe620d..aa4dc8442f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index e8681f2dde..781971035b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
index 36cda9c15e..6a8b37c712 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index 09dfcf6104..d62732b23f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index b712038d25..f7ebb34cc9 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 6685208ee6..0db01adbdb 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 4005cfff9f..25ee8db101 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index a1acfc2dab..49a00a98ae 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index eb3efae7ff..9e1ca34294 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 07344429f8..036f9d0fce 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
index c490bfafe1..8daebca96f 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
index 7dd5fd649d..a02060cd31 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
index 57df217db6..a859f118bc 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index 367a63905d..0deed6ba84 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
index c84a716114..a2ad19f3a6 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
index 34a785fbe6..adbb587d9c 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
index 282cc0bd22..cb978d8260 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
index 1ca579b2cb..9086aac5dd 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 7b811d3be7..22b4da2027 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index 53d7a7f5f8..769fb14380 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index d4d6c1a53b..3888a2acbc 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index cf134be9f6..01739a814f 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index eb73fe8da0..091dbcd841 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatAllOfTest.php
index 827deff7bd..cf10b6ec4e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatAllOfTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatAllOfTest.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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatTest.php
index ccb2a571c7..19015d59e9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatTest.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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 9ad9904264..48852ba556 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
index a17e97af66..93093478e7 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 015638a4e5..53f1a0aa49 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index ab4386c337..ae8a8b2564 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 50125ef6b0..cc76f2903b 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index f59c707548..2cf8004476 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
index 784283bc29..0f6f81ae75 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index 79a45678e6..9594626785 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index 4ec46652a0..970a127d25 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index f4db4fa049..79b5918d80 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index bb74027189..8cbc69bb7b 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index 589b18b65f..3cc7df9e6e 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index c944523276..86b34f5cca 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index ef2a96286b..e591143495 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index b177049324..68a4b0dc43 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index ee4e91cff3..42ddddff86 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 69ca41d803..d9c8a9bb5a 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index a685ebe108..5fcb629906 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index 14d01dd951..f6fd81b3ca 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index 526dda424e..4c9c784f62 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index b0525fa199..02232a6d16 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index 53eaf72352..d89a2460ce 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index c960173421..aefed931c9 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index 9082fe43a3..3d40922145 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index 3ee4922d66..ac3865d731 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index 74f2b7aab1..975ea9134d 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index e77954dc6a..a3d27b5bd4 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index bd8c9485ba..2b42e29c51 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index 896a92796d..f375ba8096 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
index 7fd3a4f904..15bbe96a10 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
index 86f893eca3..8bf77c7c2b 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index ffb0a56c36..9672d99f1e 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
index 57fdff2bef..4b7f555c89 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.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION
+++ b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python-experimental/.openapi-generator/VERSION b/samples/client/petstore/python-experimental/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/python-experimental/.openapi-generator/VERSION
+++ b/samples/client/petstore/python-experimental/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python-tornado/.openapi-generator/VERSION b/samples/client/petstore/python-tornado/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/python-tornado/.openapi-generator/VERSION
+++ b/samples/client/petstore/python-tornado/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/python/.openapi-generator/VERSION b/samples/client/petstore/python/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/python/.openapi-generator/VERSION
+++ b/samples/client/petstore/python/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION
+++ b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb
index bbe48ce1c8..d02eecd4d3 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb
index b47d86328d..bf8e6ebded 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
index 83c7c5b3f7..ef91003dc4 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb
index 886a00e2a3..b266f09774 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb
index 3bddf4870d..1f6c48a31c 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
index 7afc83fd03..5e510a6c7e 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb
index c71fce74b0..30d0aff912 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb
index 7427483f18..073625bf0b 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb
index 6fadc683d1..337c5c7002 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb
index 7534370b71..6d4679bf52 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_any_type.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_any_type.rb
index cae535b6f0..9d69317eab 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_any_type.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_any_type.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_array.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_array.rb
index 35cdf60ecb..75afda54ee 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_array.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_array.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_boolean.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_boolean.rb
index e103f9929e..3087eae37a 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_boolean.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_boolean.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb
index c8c7e2be8c..ff8841189f 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_integer.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_integer.rb
index c3b9c0058d..62d680fc49 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_integer.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_integer.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_number.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_number.rb
index d49661be79..d218e5673a 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_number.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_number.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_object.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_object.rb
index e6e062e7a8..d0dc9d7e48 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_object.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_object.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_string.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_string.rb
index 036d54b43e..22627845e3 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_string.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_string.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb
index d2e5c50c7f..55b0741b47 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb
index 1177cb4448..eb3fd03a63 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb
index 2f0b61302e..1348124c72 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb
index 0718e3c13e..8ea8dff8ff 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb
index b11fa98ee4..7f3e302da0 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/big_cat.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/big_cat.rb
index 977f194ebe..9be82c414c 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/big_cat.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/big_cat.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/big_cat_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/big_cat_all_of.rb
index d649c4de41..36b824ea45 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/big_cat_all_of.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/big_cat_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb
index 3a446fe66a..6d2a185d40 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb
index 75c801b6f1..edc40a27fc 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb
index 0734d3c5ce..ec0963e951 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb
index 7303155ab3..7a2e43d808 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb
index 6e1e8f511d..c67cb4e2db 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb
index ab337742fd..fb11d2a9f0 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb
index 556af087ed..e463e0dcd1 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb
index ac425dccb2..afaf911b6c 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb
index 8d2f538c55..de2ea593e9 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb
index 2c4fdba8dc..69fcebec61 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb
index b326686097..b1faea6d4a 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb
index 402eb74d54..ae55f5eb63 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb
index 1b2bb38a1d..8291d10e6a 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb
index 61b5b922e4..170955b07f 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb
index 847486acd5..cae8b3bbe7 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb
index 242ed9811a..94873ca4d6 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb
index dc6119543f..65f0020e66 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
index a90b484106..3c5cd7349f 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb
index 04821c3af1..950b8408a0 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb
index 172e493d95..a3b89b37c4 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb
index bca75a8105..6aaf40c05d 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb
index 1f094fba3b..2e62c4775e 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
index 7b1289d7d4..5fc1828efe 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb
index bfd84d7c72..f8b2389329 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb
index 80f2a5a15f..d7c1b931b9 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb
index 17828aa43e..6c67989e4b 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb
index 736895e395..b8edc7ba8e 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb
index 2bc5790c5e..5c1be0fd3b 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb
index a79770fe7b..86d8c0aa8c 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/type_holder_default.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/type_holder_default.rb
index a0a9c43b02..4a3e8428f9 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/type_holder_default.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/type_holder_default.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/type_holder_example.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/type_holder_example.rb
index 81e8441abe..b3aac77c45 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/type_holder_example.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/type_holder_example.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb
index 088cbdee02..096f5452b0 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/xml_item.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/xml_item.rb
index ab092021b2..f9ff5c6e27 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/xml_item.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/xml_item.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb
index 52c24ea19c..fba2068c04 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/petstore.gemspec b/samples/client/petstore/ruby-faraday/petstore.gemspec
index aea2cee433..9ec5502dc6 100644
--- a/samples/client/petstore/ruby-faraday/petstore.gemspec
+++ b/samples/client/petstore/ruby-faraday/petstore.gemspec
@@ -8,11 +8,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb
index 4a65cbd55a..71b2ae211b 100644
--- a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb
+++ b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb
@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.1.3-SNAPSHOT
+OpenAPI Generator version: 5.0.0-SNAPSHOT
 
 =end
 
@@ -118,7 +118,7 @@ describe Petstore::ApiClient do
     end
 
     it 'fails for invalid collection format' do
-      expect(proc { api_client.build_collection_param(param, :INVALID) }).to raise_error(RuntimeError, 'unknown collection format: :INVALID')
+      expect { api_client.build_collection_param(param, :INVALID) }.to raise_error(RuntimeError, 'unknown collection format: :INVALID')
     end
   end
 
diff --git a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb
index f26dd5d9ea..0bea24033c 100644
--- a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb
+++ b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb
@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.1.3-SNAPSHOT
+OpenAPI Generator version: 5.0.0-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb
index 9d2f01c329..64dcf6b8f4 100644
--- a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb
+++ b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb
@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.1.3-SNAPSHOT
+OpenAPI Generator version: 5.0.0-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/ruby/.openapi-generator/VERSION
+++ b/samples/client/petstore/ruby/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index bbe48ce1c8..d02eecd4d3 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
index b47d86328d..bf8e6ebded 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
index 83c7c5b3f7..ef91003dc4 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
index 886a00e2a3..b266f09774 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
index 3bddf4870d..1f6c48a31c 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
index 7afc83fd03..5e510a6c7e 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
index c71fce74b0..30d0aff912 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb
index d934ab301c..a7183041d2 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb
index 6fadc683d1..337c5c7002 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_error.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb
index 1f258e4a08..41055835ce 100644
--- a/samples/client/petstore/ruby/lib/petstore/configuration.rb
+++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb
index cae535b6f0..9d69317eab 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb
index 35cdf60ecb..75afda54ee 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb
index e103f9929e..3087eae37a 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
index c8c7e2be8c..ff8841189f 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb
index c3b9c0058d..62d680fc49 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb
index d49661be79..d218e5673a 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb
index e6e062e7a8..d0dc9d7e48 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb
index 036d54b43e..22627845e3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
index d2e5c50c7f..55b0741b47 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
index 1177cb4448..eb3fd03a63 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
index 2f0b61302e..1348124c72 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
index 0718e3c13e..8ea8dff8ff 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
index b11fa98ee4..7f3e302da0 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/big_cat.rb b/samples/client/petstore/ruby/lib/petstore/models/big_cat.rb
index 977f194ebe..9be82c414c 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/big_cat.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/big_cat.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/big_cat_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/big_cat_all_of.rb
index d649c4de41..36b824ea45 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/big_cat_all_of.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/big_cat_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
index 3a446fe66a..6d2a185d40 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
index 75c801b6f1..edc40a27fc 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
index 0734d3c5ce..ec0963e951 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb
index 7303155ab3..7a2e43d808 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
index 6e1e8f511d..c67cb4e2db 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb
index ab337742fd..fb11d2a9f0 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
index 556af087ed..e463e0dcd1 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
index ac425dccb2..afaf911b6c 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
index 8d2f538c55..de2ea593e9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
index 2c4fdba8dc..69fcebec61 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
index b326686097..b1faea6d4a 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb
index 402eb74d54..ae55f5eb63 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/file.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
index 1b2bb38a1d..8291d10e6a 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
index 61b5b922e4..170955b07f 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
index 847486acd5..cae8b3bbe7 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb
index 242ed9811a..94873ca4d6 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/list.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
index dc6119543f..65f0020e66 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
index a90b484106..3c5cd7349f 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
index 04821c3af1..950b8408a0 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
index 172e493d95..a3b89b37c4 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb
index bca75a8105..6aaf40c05d 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/name.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
index 1f094fba3b..2e62c4775e 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb
index 7b1289d7d4..5fc1828efe 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
index bfd84d7c72..f8b2389329 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
index 80f2a5a15f..d7c1b931b9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
index 17828aa43e..6c67989e4b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
index 736895e395..b8edc7ba8e 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
index 2bc5790c5e..5c1be0fd3b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
index a79770fe7b..86d8c0aa8c 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb b/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb
index a0a9c43b02..4a3e8428f9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb b/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb
index 81e8441abe..b3aac77c45 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb
index 088cbdee02..096f5452b0 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb b/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb
index ab092021b2..f9ff5c6e27 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb
index 52c24ea19c..fba2068c04 100644
--- a/samples/client/petstore/ruby/lib/petstore/version.rb
+++ b/samples/client/petstore/ruby/lib/petstore/version.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec
index b2c54f0b8b..d563bfe8e6 100644
--- a/samples/client/petstore/ruby/petstore.gemspec
+++ b/samples/client/petstore/ruby/petstore.gemspec
@@ -8,11 +8,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb b/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb
index c950bb6a06..a83b3e6491 100644
--- a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
index 03976556b5..07700af736 100644
--- a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb b/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
index a2a7a17119..eff08f1c93 100644
--- a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
index 513c9773cc..ca3fcccb20 100644
--- a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
index a686184319..2e82a54da1 100644
--- a/samples/client/petstore/ruby/spec/api/store_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
index e54c34eec5..1c0b025a3c 100644
--- a/samples/client/petstore/ruby/spec/api/user_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb
index ac86e812c6..4000277862 100644
--- a/samples/client/petstore/ruby/spec/api_client_spec.rb
+++ b/samples/client/petstore/ruby/spec/api_client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/configuration_spec.rb b/samples/client/petstore/ruby/spec/configuration_spec.rb
index 0f7496b6cb..0bea24033c 100644
--- a/samples/client/petstore/ruby/spec/configuration_spec.rb
+++ b/samples/client/petstore/ruby/spec/configuration_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb
index 78aa4f9b92..9fd0455c8d 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb
index 46f9ab2d80..5f3e0b3798 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb
index 9c6cd5314f..c586dfe067 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
index 99d50918ee..ee65b12fcc 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb
index c34abdc62b..2bc9d2238a 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb
index e65b9d5f2e..9cb2c965c9 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb
index 2e0722616d..c8cfee233f 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb
index 57e2b250db..d658f50647 100644
--- a/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/animal_spec.rb b/samples/client/petstore/ruby/spec/models/animal_spec.rb
index 927fc6eac3..8b3e9adc53 100644
--- a/samples/client/petstore/ruby/spec/models/animal_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/animal_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
index 37c7a22e28..628f1c4d7c 100644
--- a/samples/client/petstore/ruby/spec/models/api_response_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb b/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
index 6e8f7ed036..ea41c9a4b3 100644
--- a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb b/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
index 6a178c5d7c..ba90932a79 100644
--- a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/array_test_spec.rb b/samples/client/petstore/ruby/spec/models/array_test_spec.rb
index bc1e0c23c4..6ff7397ad4 100644
--- a/samples/client/petstore/ruby/spec/models/array_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/array_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/big_cat_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/big_cat_all_of_spec.rb
index a298ac5ddc..0b9749e9cd 100644
--- a/samples/client/petstore/ruby/spec/models/big_cat_all_of_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/big_cat_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/big_cat_spec.rb b/samples/client/petstore/ruby/spec/models/big_cat_spec.rb
index 143288b00c..53c783104c 100644
--- a/samples/client/petstore/ruby/spec/models/big_cat_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/big_cat_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
index e13d275c04..451c59af97 100644
--- a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb
index 36682b2522..926ce8a2a3 100644
--- a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/cat_spec.rb b/samples/client/petstore/ruby/spec/models/cat_spec.rb
index 0963c89dd7..3efb677ce6 100644
--- a/samples/client/petstore/ruby/spec/models/cat_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/cat_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/category_spec.rb b/samples/client/petstore/ruby/spec/models/category_spec.rb
index 499ec3e433..82ecd78d96 100644
--- a/samples/client/petstore/ruby/spec/models/category_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/category_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/class_model_spec.rb b/samples/client/petstore/ruby/spec/models/class_model_spec.rb
index 4978cb4408..761e893312 100644
--- a/samples/client/petstore/ruby/spec/models/class_model_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/class_model_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/client_spec.rb b/samples/client/petstore/ruby/spec/models/client_spec.rb
index f398079d22..4bf1ce0622 100644
--- a/samples/client/petstore/ruby/spec/models/client_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb
index a7550b27d1..5596927d42 100644
--- a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/dog_spec.rb b/samples/client/petstore/ruby/spec/models/dog_spec.rb
index a45cb6494c..b82df3e9d7 100644
--- a/samples/client/petstore/ruby/spec/models/dog_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/dog_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
index 4739c359f8..ac75c92581 100644
--- a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
index 6fbc80f591..29fcd05aa7 100644
--- a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
index 55f1e58a8c..acd89c52df 100644
--- a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb b/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
index 062dca4b3c..8a8d92658c 100644
--- a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/file_spec.rb b/samples/client/petstore/ruby/spec/models/file_spec.rb
index ec387ff1e7..b9d1499766 100644
--- a/samples/client/petstore/ruby/spec/models/file_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/file_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
index dfeb78ac02..953fc14a6d 100644
--- a/samples/client/petstore/ruby/spec/models/format_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb b/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
index 05f9274266..9efa03a22f 100644
--- a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/list_spec.rb b/samples/client/petstore/ruby/spec/models/list_spec.rb
index b06d0ef6c1..db397aa108 100644
--- a/samples/client/petstore/ruby/spec/models/list_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/list_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/map_test_spec.rb b/samples/client/petstore/ruby/spec/models/map_test_spec.rb
index 7e769bdea2..f7ff6788b0 100644
--- a/samples/client/petstore/ruby/spec/models/map_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/map_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
index e33a66037b..0e88f47252 100644
--- a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb
index 714d04fdae..133f6b94c1 100644
--- a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
index e1daf92938..57d400eb11 100644
--- a/samples/client/petstore/ruby/spec/models/model_return_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/name_spec.rb b/samples/client/petstore/ruby/spec/models/name_spec.rb
index 8ba0030d7f..c882db4f22 100644
--- a/samples/client/petstore/ruby/spec/models/name_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/number_only_spec.rb b/samples/client/petstore/ruby/spec/models/number_only_spec.rb
index 160257f32f..0963591fcc 100644
--- a/samples/client/petstore/ruby/spec/models/number_only_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/order_spec.rb b/samples/client/petstore/ruby/spec/models/order_spec.rb
index a28aeb280a..3f1d973b27 100644
--- a/samples/client/petstore/ruby/spec/models/order_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/order_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb
index 1edbe6cfbd..bb36f48895 100644
--- a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb b/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb
index fbe1fc28e8..ea9762da93 100644
--- a/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/pet_spec.rb b/samples/client/petstore/ruby/spec/models/pet_spec.rb
index 2a9b64ce49..dc0a0898c9 100644
--- a/samples/client/petstore/ruby/spec/models/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/pet_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb
index 74a7b93a32..8d60e44331 100644
--- a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
index 58ba339161..b548f7f095 100644
--- a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/tag_spec.rb b/samples/client/petstore/ruby/spec/models/tag_spec.rb
index b43eb2003e..3a74543904 100644
--- a/samples/client/petstore/ruby/spec/models/tag_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/tag_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb b/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb
index 20aae93dbd..b7bf49dbca 100644
--- a/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb b/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb
index 2ea9f09f36..ba58952fcc 100644
--- a/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/user_spec.rb b/samples/client/petstore/ruby/spec/models/user_spec.rb
index fcc8959b18..2eb31e993a 100644
--- a/samples/client/petstore/ruby/spec/models/user_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/user_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/models/xml_item_spec.rb b/samples/client/petstore/ruby/spec/models/xml_item_spec.rb
index 4fc2d16615..8f300f2f8a 100644
--- a/samples/client/petstore/ruby/spec/models/xml_item_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/xml_item_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb
index 7b044ff2e0..64dcf6b8f4 100644
--- a/samples/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/client/petstore/ruby/spec/spec_helper.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/scala-akka/.openapi-generator/VERSION b/samples/client/petstore/scala-akka/.openapi-generator/VERSION
index b5d898602c..d99e7162d0 100644
--- a/samples/client/petstore/scala-akka/.openapi-generator/VERSION
+++ b/samples/client/petstore/scala-akka/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
index edd9687349..c72b43a774 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
index 6b06d649e0..0170cba254 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
index 40e83a8f01..639c2a987f 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
index f12b3146f8..7992b96875 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index 9ec1db6164..7857637ad5 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
index 4c3f0410cf..2a18d576d8 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
index b182f20a56..8d890ff21c 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index 1f514861f1..3d12e64586 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
index 1baf2c5c88..184f74ac3b 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
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 ad755aed74..d99e7162d0 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,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+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 ad755aed74..d99e7162d0 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,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION b/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+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 ad755aed74..d99e7162d0 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,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/elm/src/Api/Data.elm b/samples/openapi3/client/elm/src/Api/Data.elm
index df7113ce37..0af6fe9fa3 100644
--- a/samples/openapi3/client/elm/src/Api/Data.elm
+++ b/samples/openapi3/client/elm/src/Api/Data.elm
@@ -99,7 +99,7 @@ type alias Array =
 {-| Composed model
 -}
 type alias Composed =
-    { base : Float
+    { composedBase: ComposedBase
     , value : Maybe String
     }
 
@@ -318,11 +318,10 @@ encodeComposedPairs : Composed -> List EncodedField
 encodeComposedPairs model =
     let
         pairs =
-            [ encode "base" Json.Encode.float model.base
-            , maybeEncode "value" Json.Encode.string model.value
+            [ maybeEncode "value" Json.Encode.string model.value
             ]
     in
-    pairs
+    encodeComposedBasePairs model.composedBase ++ pairs
 
 
 encodeComposedBase : ComposedBase -> Json.Encode.Value
@@ -653,7 +652,7 @@ arrayDecoder =
 composedDecoder : Json.Decode.Decoder Composed
 composedDecoder =
     Json.Decode.succeed Composed
-        |> decode "base" Json.Decode.float 
+        |> decodeChain composedBaseDecoder
         |> maybeDecode "value" Json.Decode.string Nothing
 
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION b/samples/openapi3/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+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 ad755aed74..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index dd1f874341..a8f4734c12 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
index 300e43ba22..9a54cc8a86 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index 95a2f23bc7..783927d5f6 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 5fb426ca2f..62d9381eee 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index 14e5d1d258..347e18348c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index ed4b4bb287..82b22cfbda 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index 26207df53a..fc80af1d62 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index 9643538a28..83dd6134b7 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index c1f3b8b774..f7efbb034a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index c08e13912b..1ebf4547a4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index b570c41a2d..6b468e9604 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index c7efce4ff7..db94841581 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index b49068d1c7..9b72d9ffe5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index dcec81a09e..11244ecfb2 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 76e78320e2..32c44dd7df 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index 421a242a5f..011f4a5e87 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index e48a7b706b..fee455fefb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index b1209c926f..ea464ecb3d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
index 0c9d181d8c..af85243996 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index bf270280bc..73864723cc 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index cb700028c9..0fc47ff254 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index 42814c8f38..a458462807 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index 17b44a8d1a..de27e21800 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
index 978bc6f636..90d3768d64 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index 7b4287672e..a18c5b38c0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index c855b2a942..4821949ea0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index d1694a8f13..bdae38871a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index 7edcd141a6..d660108328 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index c2509bae29..27324041b2 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
index 5c72c31b3d..d803f9439b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index f08079ada2..9db27c7c93 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index 6f2db7e9d4..5d0fac0c83 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
index 6f3c0a2017..2fa4357088 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
index 66abd4f1b9..f79533a0b8 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
index 31ef56c942..b400495b3f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
index 1b89e9398f..291d81be46 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
index 40d76c1c76..276e87343c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
index 1b14f460ed..9fe85483ea 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
index a084e6d601..5fbeccae01 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
index 113e6b1973..c574882dbf 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 6d6e57065b..77e3656df5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 5d69a3c7d4..7e05ebd490 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index 60c947675a..4627a69ab5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index ae75e849e5..79bcab1ca9 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index 178c01fc45..8bfec03077 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index 34511f5924..5661524ff9 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index 81e39fca17..490c760977 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
index d847fb160f..090264d5eb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index 6a1172a3c0..17f4844d3b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index 3a88fd3d92..2fc6eaa6c8 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index 8970731b14..fc26df1dd1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index 569924a8b2..84e8aa7520 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
index 270d941235..faba95dda0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
index 318e5337af..54311eb6ec 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
index c3d60c5306..b5612a53c4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index 49bed75f0b..c3cde4e2da 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index b1f6bb7cbb..32db4a5195 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index db2932035d..cb041a5157 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 6f0fe496cb..b04e3a085d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index e8681f2dde..781971035b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index 09dfcf6104..d62732b23f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index b712038d25..f7ebb34cc9 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
index aaea17a1f8..f747862fb4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 2e51405d16..cf227d1c7b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 4005cfff9f..25ee8db101 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index a1acfc2dab..49a00a98ae 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index eb3efae7ff..9e1ca34294 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 07344429f8..036f9d0fce 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index 25289635aa..67641db313 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 7b811d3be7..22b4da2027 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index 53d7a7f5f8..769fb14380 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index d4d6c1a53b..3888a2acbc 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index cf134be9f6..01739a814f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index eb73fe8da0..091dbcd841 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 9ad9904264..48852ba556 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
index a17e97af66..93093478e7 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 015638a4e5..53f1a0aa49 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index ab4386c337..ae8a8b2564 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 50125ef6b0..cc76f2903b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index f59c707548..2cf8004476 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
index 784283bc29..0f6f81ae75 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index 79a45678e6..9594626785 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index 4ec46652a0..970a127d25 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index f4db4fa049..79b5918d80 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index 6f78074ed6..65016c2860 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index 589b18b65f..3cc7df9e6e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index c944523276..86b34f5cca 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
index 04792b271b..412b300479 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index b663310670..f4a2370d55 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index b177049324..68a4b0dc43 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
index 1f7fbb1642..b83b372718 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
index c7c81b2bf6..d5cd1a127c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
index 92a17f1871..7d83b70298 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
index 489be1d411..663fc6976b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
index 2712870d28..3279f098ef 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
index c6768862cb..6e0bfadae7 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
index e8106650d8..6bad7ab2e1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
index 83a735cdfe..f4de899411 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index ee4e91cff3..42ddddff86 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 69ca41d803..d9c8a9bb5a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index a685ebe108..5fcb629906 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index 14d01dd951..f6fd81b3ca 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index 526dda424e..4c9c784f62 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index b0525fa199..02232a6d16 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
index 6ce4e96b8d..7101397381 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index 53eaf72352..d89a2460ce 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index c960173421..aefed931c9 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index 9082fe43a3..3d40922145 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
index 0d38516265..08cdb11cfb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
index 9c6e9b966a..4594e35f95 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
index 64aa4909d5..e1ad10bf28 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index 3ee4922d66..ac3865d731 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index 74f2b7aab1..975ea9134d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index e77954dc6a..a3d27b5bd4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index bd8c9485ba..2b42e29c51 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index 896a92796d..f375ba8096 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index ffb0a56c36..9672d99f1e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/ruby-faraday/.openapi-generator/VERSION b/samples/openapi3/client/petstore/ruby-faraday/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/ruby-faraday/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore.rb
index 6e795d022a..7f8ae56e12 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb
index c3721c1a44..dfa6972327 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb
index 22eae6c1d3..eb43bc54be 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
index afb217fbe4..c2b8c01eb3 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb
index 1c6155b82c..1e44496d5f 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb
index ead708fa86..849945bcd6 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
index a6cd52823b..dafc7a7169 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb
index 4fd46da840..8e2dd2a11a 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api_client.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api_client.rb
index 7427483f18..073625bf0b 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api_client.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api_client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api_error.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api_error.rb
index 6fadc683d1..337c5c7002 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api_error.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api_error.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/configuration.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/configuration.rb
index 077496e5c0..a98fb5c45b 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/configuration.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/configuration.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb
index 19b8551b30..2e353ef8e4 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/animal.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/animal.rb
index d2e5c50c7f..55b0741b47 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/animal.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/animal.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb
index 1177cb4448..eb3fd03a63 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb
index 2f0b61302e..1348124c72 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb
index 0718e3c13e..8ea8dff8ff 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb
index b11fa98ee4..7f3e302da0 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb
index 3a446fe66a..6d2a185d40 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/cat.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/cat.rb
index 75c801b6f1..edc40a27fc 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/cat.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/cat.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb
index 0734d3c5ce..ec0963e951 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/category.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/category.rb
index 7303155ab3..7a2e43d808 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/category.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/category.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb
index 6e1e8f511d..c67cb4e2db 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/client.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/client.rb
index ab337742fd..fb11d2a9f0 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/client.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/dog.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/dog.rb
index 556af087ed..e463e0dcd1 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/dog.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/dog.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb
index ac425dccb2..afaf911b6c 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb
index 8d2f538c55..de2ea593e9 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb
index 2c4fdba8dc..69fcebec61 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb
index 85ce3724bc..473d7994ad 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/file.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/file.rb
index 402eb74d54..ae55f5eb63 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/file.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/file.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb
index 1b2bb38a1d..8291d10e6a 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/foo.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/foo.rb
index 09022fcb0c..780ef4ae7d 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/foo.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/foo.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb
index fcc861bd3a..d39e9c9158 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb
index 847486acd5..cae8b3bbe7 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb
index aa6293f16e..056413a443 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object.rb
index 991e879de8..7d2ce0e05f 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object1.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object1.rb
index 9308c6c2ad..45a9d5bfcd 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object1.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object1.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object2.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object2.rb
index 7b97d51ea8..51784af066 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object2.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object2.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object3.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object3.rb
index 839675bac6..71fe8bd38a 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object3.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object3.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object4.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object4.rb
index 051d5f2919..560e747ce7 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object4.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object4.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object5.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object5.rb
index 5e643a28f3..e75bb45298 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object5.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_object5.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb
index 373ffdd095..a65f1ee87f 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/list.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/list.rb
index 242ed9811a..94873ca4d6 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/list.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/list.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb
index dc6119543f..65f0020e66 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
index a90b484106..3c5cd7349f 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb
index 04821c3af1..950b8408a0 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb
index 172e493d95..a3b89b37c4 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/name.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/name.rb
index bca75a8105..6aaf40c05d 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/name.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb
index bb55250777..dd0d1c2047 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb
index 1f094fba3b..2e62c4775e 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/order.rb
index 7b1289d7d4..5fc1828efe 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/order.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/order.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb
index bfd84d7c72..f8b2389329 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb
index 80f2a5a15f..d7c1b931b9 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb
index f8f2fa80c5..dae97c9a7f 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb
index 69d4c647a6..58c8c97413 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb
index 45d7be3ec2..8ffe7f388d 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/pet.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/pet.rb
index 17828aa43e..6c67989e4b 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/pet.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/pet.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb
index 736895e395..b8edc7ba8e 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb
index 2bc5790c5e..5c1be0fd3b 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/tag.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/tag.rb
index a79770fe7b..86d8c0aa8c 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/tag.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/tag.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/user.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/user.rb
index 088cbdee02..096f5452b0 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/user.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/models/user.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/version.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/version.rb
index 52c24ea19c..fba2068c04 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/version.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/version.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/petstore.gemspec b/samples/openapi3/client/petstore/ruby-faraday/petstore.gemspec
index aea2cee433..9ec5502dc6 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/petstore.gemspec
+++ b/samples/openapi3/client/petstore/ruby-faraday/petstore.gemspec
@@ -8,11 +8,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb
index 496b8f6b53..bf187f0971 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/default_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/default_api_spec.rb
index 6134b3878b..fd58eaa21a 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/default_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/default_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb
index 10f77b2ee2..083a1c6ab7 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb
index 51d058f0c6..1db2b3c9ef 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb
index 154492f9ba..26ca32b2f7 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/store_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/store_api_spec.rb
index 7fc549e230..1fd9faf40a 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/store_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/store_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/user_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/user_api_spec.rb
index b1a353bdc4..39178c5a5a 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/user_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/user_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api_client_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api_client_spec.rb
index de6dbdac65..71b2ae211b 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/api_client_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api_client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/configuration_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/configuration_spec.rb
index 0f7496b6cb..0bea24033c 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/configuration_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/configuration_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb
index 563363579b..93a5b0d5fb 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/animal_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/animal_spec.rb
index 927fc6eac3..8b3e9adc53 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/animal_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/animal_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/api_response_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/api_response_spec.rb
index 37c7a22e28..628f1c4d7c 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/api_response_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/api_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb
index 6e8f7ed036..ea41c9a4b3 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb
index 6a178c5d7c..ba90932a79 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_test_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_test_spec.rb
index bc1e0c23c4..6ff7397ad4 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb
index e13d275c04..451c59af97 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb
index 36682b2522..926ce8a2a3 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_spec.rb
index 0963c89dd7..3efb677ce6 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/category_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/category_spec.rb
index 499ec3e433..82ecd78d96 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/category_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/category_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/class_model_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/class_model_spec.rb
index 4978cb4408..761e893312 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/class_model_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/class_model_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/client_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/client_spec.rb
index f398079d22..4bf1ce0622 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/client_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb
index a7550b27d1..5596927d42 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_spec.rb
index a45cb6494c..b82df3e9d7 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb
index 4739c359f8..ac75c92581 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_class_spec.rb
index 6fbc80f591..29fcd05aa7 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb
index 611795ea29..7f4c9c97e8 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb
index 062dca4b3c..8a8d92658c 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_spec.rb
index ec387ff1e7..b9d1499766 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/foo_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/foo_spec.rb
index 0d1046ec41..46f8aa8a1d 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/foo_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/foo_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/format_test_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/format_test_spec.rb
index 7406039683..72fe239f29 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/format_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/format_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb
index 05f9274266..9efa03a22f 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb
index d7304475e0..e90a77ec8a 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb
index bc12564ff6..a702fd774e 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb
index a5d3da9549..7013915ea3 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb
index 010855a49b..4daf41b4ac 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb
index fc275ba7d1..fa806f9586 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb
index 2a3a466c75..e2410b21bc 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb
index 6e87421e72..c5a7db4478 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb
index 32dff6b71e..812470131b 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/list_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/list_spec.rb
index b06d0ef6c1..db397aa108 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/list_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/list_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/map_test_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/map_test_spec.rb
index 7e769bdea2..f7ff6788b0 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/map_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/map_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb
index e33a66037b..0e88f47252 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb
index 714d04fdae..133f6b94c1 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/model_return_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/model_return_spec.rb
index e1daf92938..57d400eb11 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/model_return_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/model_return_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/name_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/name_spec.rb
index 8ba0030d7f..c882db4f22 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/name_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb
index e1f6ac6727..f1301d0a83 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/number_only_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/number_only_spec.rb
index 160257f32f..0963591fcc 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/order_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/order_spec.rb
index a28aeb280a..3f1d973b27 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/order_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/order_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb
index 1edbe6cfbd..bb36f48895 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_default_value_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_default_value_spec.rb
index 5c78e6e046..7bd96a7aba 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_default_value_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_default_value_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_default_value_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_default_value_spec.rb
index 4215096f9c..48a94827e5 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_default_value_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_default_value_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_spec.rb
index a4a38808e6..a0ac4c81f0 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_spec.rb
index fbe1fc28e8..ea9762da93 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/pet_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/pet_spec.rb
index 2a9b64ce49..dc0a0898c9 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/pet_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/pet_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb
index 74a7b93a32..8d60e44331 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb
index 58ba339161..b548f7f095 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/tag_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/tag_spec.rb
index b43eb2003e..3a74543904 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/tag_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/tag_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/user_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/user_spec.rb
index fcc8959b18..2eb31e993a 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/user_spec.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/user_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/spec_helper.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/spec_helper.rb
index 7b044ff2e0..64dcf6b8f4 100644
--- a/samples/openapi3/client/petstore/ruby-faraday/spec/spec_helper.rb
+++ b/samples/openapi3/client/petstore/ruby-faraday/spec/spec_helper.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION b/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore.rb b/samples/openapi3/client/petstore/ruby/lib/petstore.rb
index 6e795d022a..7f8ae56e12 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
index c3721c1a44..dfa6972327 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb
index 22eae6c1d3..eb43bc54be 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb
index afb217fbe4..c2b8c01eb3 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
index 1c6155b82c..1e44496d5f 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb
index 211443d4ac..4858424f2a 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb
index 9a2f7d25f3..dc4952419a 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb
index 109a262cf8..b2fbf6be7c 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb
index d934ab301c..a7183041d2 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb
index 6fadc683d1..337c5c7002 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb
index 4fd7f7e765..75e3e441f4 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
index 19b8551b30..2e353ef8e4 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb
index d2e5c50c7f..55b0741b47 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb
index 1177cb4448..eb3fd03a63 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
index 2f0b61302e..1348124c72 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
index 0718e3c13e..8ea8dff8ff 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb
index b11fa98ee4..7f3e302da0 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb
index 3a446fe66a..6d2a185d40 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb
index 75c801b6f1..edc40a27fc 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
index 0734d3c5ce..ec0963e951 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb
index 7303155ab3..7a2e43d808 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb
index 6e1e8f511d..c67cb4e2db 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb
index ab337742fd..fb11d2a9f0 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb
index 556af087ed..e463e0dcd1 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
index ac425dccb2..afaf911b6c 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
index 8d2f538c55..de2ea593e9 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb
index 2c4fdba8dc..69fcebec61 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb
index 85ce3724bc..473d7994ad 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb
index 402eb74d54..ae55f5eb63 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
index 1b2bb38a1d..8291d10e6a 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb
index 09022fcb0c..780ef4ae7d 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb
index fcc861bd3a..d39e9c9158 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
index 847486acd5..cae8b3bbe7 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb
index aa6293f16e..056413a443 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object.rb
index 991e879de8..7d2ce0e05f 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object1.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object1.rb
index 9308c6c2ad..45a9d5bfcd 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object1.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object1.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object2.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object2.rb
index 7b97d51ea8..51784af066 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object2.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object2.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object3.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object3.rb
index 839675bac6..71fe8bd38a 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object3.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object3.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object4.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object4.rb
index 051d5f2919..560e747ce7 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object4.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object4.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object5.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object5.rb
index 5e643a28f3..e75bb45298 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object5.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_object5.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb
index 373ffdd095..a65f1ee87f 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb
index 242ed9811a..94873ca4d6 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb
index dc6119543f..65f0020e66 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
index a90b484106..3c5cd7349f 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb
index 04821c3af1..950b8408a0 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb
index 172e493d95..a3b89b37c4 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb
index bca75a8105..6aaf40c05d 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb
index bb55250777..dd0d1c2047 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb
index 1f094fba3b..2e62c4775e 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb
index 7b1289d7d4..5fc1828efe 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb
index bfd84d7c72..f8b2389329 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb
index 80f2a5a15f..d7c1b931b9 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb
index f8f2fa80c5..dae97c9a7f 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb
index 69d4c647a6..58c8c97413 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb
index 45d7be3ec2..8ffe7f388d 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb
index 17828aa43e..6c67989e4b 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb
index 736895e395..b8edc7ba8e 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb
index 2bc5790c5e..5c1be0fd3b 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb
index a79770fe7b..86d8c0aa8c 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb
index 088cbdee02..096f5452b0 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb
index 52c24ea19c..fba2068c04 100644
--- a/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb
+++ b/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/petstore.gemspec b/samples/openapi3/client/petstore/ruby/petstore.gemspec
index b2c54f0b8b..d563bfe8e6 100644
--- a/samples/openapi3/client/petstore/ruby/petstore.gemspec
+++ b/samples/openapi3/client/petstore/ruby/petstore.gemspec
@@ -8,11 +8,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb
index 496b8f6b53..bf187f0971 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb
index 6134b3878b..fd58eaa21a 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb
index 10f77b2ee2..083a1c6ab7 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
index 51d058f0c6..1db2b3c9ef 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb
index 154492f9ba..26ca32b2f7 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb
index 7fc549e230..1fd9faf40a 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb
index b1a353bdc4..39178c5a5a 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb
index ac86e812c6..4000277862 100644
--- a/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb b/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
index 0f7496b6cb..0bea24033c 100644
--- a/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
index 563363579b..93a5b0d5fb 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb
index 927fc6eac3..8b3e9adc53 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb
index 37c7a22e28..628f1c4d7c 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
index 6e8f7ed036..ea41c9a4b3 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
index 6a178c5d7c..ba90932a79 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb
index bc1e0c23c4..6ff7397ad4 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb
index e13d275c04..451c59af97 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb
index 36682b2522..926ce8a2a3 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb
index 0963c89dd7..3efb677ce6 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb
index 499ec3e433..82ecd78d96 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb
index 4978cb4408..761e893312 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb
index f398079d22..4bf1ce0622 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb
index a7550b27d1..5596927d42 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb
index a45cb6494c..b82df3e9d7 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb
index 4739c359f8..ac75c92581 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb
index 6fbc80f591..29fcd05aa7 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb
index 611795ea29..7f4c9c97e8 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
index 062dca4b3c..8a8d92658c 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb
index ec387ff1e7..b9d1499766 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb
index 0d1046ec41..46f8aa8a1d 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb
index 7406039683..72fe239f29 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
index 05f9274266..9efa03a22f 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb
index d7304475e0..e90a77ec8a 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =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 bc12564ff6..a702fd774e 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,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =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 a5d3da9549..7013915ea3 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,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =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 010855a49b..4daf41b4ac 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,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =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 fc275ba7d1..fa806f9586 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,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =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 2a3a466c75..e2410b21bc 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,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =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 6e87421e72..c5a7db4478 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,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb
index 32dff6b71e..812470131b 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb
index b06d0ef6c1..db397aa108 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb
index 7e769bdea2..f7ff6788b0 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
index e33a66037b..0e88f47252 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb
index 714d04fdae..133f6b94c1 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb
index e1daf92938..57d400eb11 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb
index 8ba0030d7f..c882db4f22 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb
index e1f6ac6727..f1301d0a83 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb
index 160257f32f..0963591fcc 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb
index a28aeb280a..3f1d973b27 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb
index 1edbe6cfbd..bb36f48895 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb
index 5c78e6e046..7bd96a7aba 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb
index 4215096f9c..48a94827e5 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb
index a4a38808e6..a0ac4c81f0 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb
index fbe1fc28e8..ea9762da93 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb
index 2a9b64ce49..dc0a0898c9 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb
index 74a7b93a32..8d60e44331 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb
index 58ba339161..b548f7f095 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb
index b43eb2003e..3a74543904 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb
index fcc8959b18..2eb31e993a 100644
--- a/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb b/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
index 7b044ff2e0..64dcf6b8f4 100644
--- a/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb
@@ -6,11 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/petstore/scala-akka/.openapi-generator/VERSION b/samples/openapi3/client/petstore/scala-akka/.openapi-generator/VERSION
index b5d898602c..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/scala-akka/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/scala-akka/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/scala-sttp/.openapi-generator/VERSION b/samples/openapi3/client/petstore/scala-sttp/.openapi-generator/VERSION
index b5d898602c..d99e7162d0 100644
--- a/samples/openapi3/client/petstore/scala-sttp/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/scala-sttp/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/schema/petstore/mysql/.openapi-generator/VERSION b/samples/schema/petstore/mysql/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/schema/petstore/mysql/.openapi-generator/VERSION
+++ b/samples/schema/petstore/mysql/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/.openapi-generator/VERSION b/samples/server/petstore/cpp-qt5-qhttpengine-server/.openapi-generator/VERSION
index b5d898602c..d99e7162d0 100644
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/go-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-api-server/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/go-api-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/go-api-server/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
index b27bd9c315..30a988c896 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
@@ -191,14 +191,14 @@
     <java.version>1.7</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.18</swagger-core-version>
+    <swagger-core-version>1.5.22</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
-    <jackson-jaxrs-version>2.9.8</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml
index 02d5831120..8e95f0335c 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml
@@ -58,8 +58,8 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
             <!-- Version is just a guess -->
-            <!-- Require at lease CXF 3.1.2 since HTTP PATCH support was added on this version -->
-            <version>3.1.2</version>
+            <!-- IBM WebSphere Application Server Liberty Core v8.5.5.6 uses v3.0.2, source https://www.ibm.com/support/knowledgecenter/SSD28V_8.5.5/com.ibm.websphere.wlp.core.doc/ae/rwlp_jaxrs_secure.html -->
+            <version>3.0.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -77,6 +77,13 @@
             <version>[1.5.3,1.5.16]</version>
         </dependency>
         
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
        <!-- Bean Validation API support -->
        <dependency>
            <groupId>javax.validation</groupId>
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
index 7a62c0cdaa..d6cc377e6b 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
@@ -191,14 +191,14 @@
     <java.version>1.7</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.18</swagger-core-version>
+    <swagger-core-version>1.5.22</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
-    <jackson-jaxrs-version>2.9.8</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-datelib-j8/README.md b/samples/server/petstore/jaxrs-datelib-j8/README.md
index 87263cc050..28668de74f 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/README.md
+++ b/samples/server/petstore/jaxrs-datelib-j8/README.md
@@ -1,11 +1,12 @@
-# Swagger Jersey generated server
+# JAX-RS/Jersey server with OpenAPI
 
 ## Overview
-This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the 
-[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
-is an example of building a swagger-enabled JAX-RS server.
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using an
+[OpenAPI-Spec](https://openapis.org), you can easily generate a server stub.
 
+This is an example of building a OpenAPI-enabled JAX-RS server.
 This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
+Jersey is used as JAX-RS implementation, `io.swagger:swagger-jersey2-jaxrs` is used to derive the OpenAPI Specification from the annotated code.
 
 To run the server, please execute the following:
 
@@ -13,10 +14,10 @@ To run the server, please execute the following:
 mvn clean package jetty:run
 ```
 
-You can then view the swagger listing here:
+You can then view the OpenAPI v2 specification here:
 
 ```
-http://localhost:8082/v2/openapi.json
+http://localhost:8082/v2/swagger.json
 ```
 
 Note that if you have configured the `host` to be something other than localhost, the calls through
diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
index b8d2142456..4cf456173f 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml
+++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
@@ -184,7 +184,7 @@
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
     <junit-version>4.13</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/Bootstrap.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/Bootstrap.java
index c292957ea4..a2f745f947 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/Bootstrap.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/Bootstrap.java
@@ -16,9 +16,9 @@ public class Bootstrap extends HttpServlet {
     Info info = new Info()
       .title("OpenAPI Server")
       .description("This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\")
-      .termsOfService("http://swagger.io/terms/")
+      .termsOfService("")
       .contact(new Contact()
-        .email("apiteam@swagger.io"))
+        .email(""))
       .license(new License()
         .name("Apache-2.0")
         .url("https://www.apache.org/licenses/LICENSE-2.0.html"));
diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-jersey/README.md b/samples/server/petstore/jaxrs-jersey/README.md
index 64a6c60dc3..4d4b9499d4 100644
--- a/samples/server/petstore/jaxrs-jersey/README.md
+++ b/samples/server/petstore/jaxrs-jersey/README.md
@@ -17,7 +17,7 @@ mvn clean package jetty:run
 You can then view the OpenAPI v2 specification here:
 
 ```
-http://localhost:8080/v2/swagger.json
+http://localhost:80/v2/swagger.json
 ```
 
 Note that if you have configured the `host` to be something other than localhost, the calls through
diff --git a/samples/server/petstore/jaxrs-jersey/pom.xml b/samples/server/petstore/jaxrs-jersey/pom.xml
index 965776a7ad..a60e297f03 100644
--- a/samples/server/petstore/jaxrs-jersey/pom.xml
+++ b/samples/server/petstore/jaxrs-jersey/pom.xml
@@ -47,7 +47,7 @@
           <stopKey>stopit</stopKey>
           <stopWait>10</stopWait>
           <httpConnector>
-            <port>8080</port>
+            <port>80</port>
             <idleTimeout>60000</idleTimeout>
           </httpConnector>
         </configuration>
@@ -184,7 +184,7 @@
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
     <junit-version>4.13</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java
index 6d78a1a397..a2f745f947 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java
@@ -15,7 +15,7 @@ public class Bootstrap extends HttpServlet {
   public void init(ServletConfig config) throws ServletException {
     Info info = new Info()
       .title("OpenAPI Server")
-      .description("This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.")
+      .description("This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\")
       .termsOfService("")
       .contact(new Contact()
         .email(""))
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml
index 78aae0f442..69846c8e9d 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml
+++ b/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml
@@ -38,7 +38,7 @@
         </init-param>
         <init-param>
             <param-name>swagger.api.basepath</param-name>
-            <param-value>http://petstore.swagger.io/v2</param-value>
+            <param-value>http://petstore.swagger.io:80/v2</param-value>
         </init-param>
 
         <load-on-startup>2</load-on-startup>
diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/default/build.gradle b/samples/server/petstore/jaxrs-resteasy/default/build.gradle
index c58d59ff0e..b4805e5de7 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/default/build.gradle
@@ -4,7 +4,7 @@ project.version = "1.0.0"
 project.group = "org.openapitools"
 
 repositories {
-    mavenCentral()
+    maven { url "https://repo1.maven.org/maven2" }
 }
 
 dependencies {
@@ -15,10 +15,10 @@ dependencies {
     providedCompile 'javax.annotation:javax.annotation-api:1.2'
     providedCompile 'javax:javaee-api:7.0'
     providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
-    compile         'io.swagger:swagger-annotations:1.5.10'
+    compile         'io.swagger:swagger-annotations:1.5.22'
     compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
     providedCompile 'javax.validation:validation-api:1.1.0.Final'
-    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
     compile         'joda-time:joda-time:2.7'
     //TODO: swaggerFeature
     compile 'io.swagger:swagger-jaxrs:1.5.12'
diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
index aad60f785b..a80ce0132f 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
@@ -71,6 +71,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -123,7 +129,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
+            <version>2.9.9</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -180,7 +186,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-core-version>1.5.22</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
index c58d59ff0e..b4805e5de7 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
@@ -4,7 +4,7 @@ project.version = "1.0.0"
 project.group = "org.openapitools"
 
 repositories {
-    mavenCentral()
+    maven { url "https://repo1.maven.org/maven2" }
 }
 
 dependencies {
@@ -15,10 +15,10 @@ dependencies {
     providedCompile 'javax.annotation:javax.annotation-api:1.2'
     providedCompile 'javax:javaee-api:7.0'
     providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
-    compile         'io.swagger:swagger-annotations:1.5.10'
+    compile         'io.swagger:swagger-annotations:1.5.22'
     compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
     providedCompile 'javax.validation:validation-api:1.1.0.Final'
-    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
     compile         'joda-time:joda-time:2.7'
     //TODO: swaggerFeature
     compile 'io.swagger:swagger-jaxrs:1.5.12'
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
index c67485fa47..451da95535 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
@@ -71,6 +71,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -123,7 +129,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
+            <version>2.9.9</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -180,7 +186,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-core-version>1.5.22</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface/pom.xml b/samples/server/petstore/jaxrs-spec-interface/pom.xml
index 07b7670132..a49d8aa395 100644
--- a/samples/server/petstore/jaxrs-spec-interface/pom.xml
+++ b/samples/server/petstore/jaxrs-spec-interface/pom.xml
@@ -57,6 +57,12 @@
       <scope>provided</scope>
       <version>1.5.3</version>
     </dependency>
+    <!-- @Nullable annotation -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -72,7 +78,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
     <junit-version>4.8.1</junit-version>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec/pom.xml b/samples/server/petstore/jaxrs-spec/pom.xml
index 21c03b9ad7..885415e0f2 100644
--- a/samples/server/petstore/jaxrs-spec/pom.xml
+++ b/samples/server/petstore/jaxrs-spec/pom.xml
@@ -72,6 +72,12 @@
       <scope>provided</scope>
       <version>1.5.3</version>
     </dependency>
+    <!-- @Nullable annotation -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -107,7 +113,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
     <junit-version>4.8.1</junit-version>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md
index e3df5e5484..0c37a719c0 100644
--- a/samples/server/petstore/kotlin-server/ktor/README.md
+++ b/samples/server/petstore/kotlin-server/ktor/README.md
@@ -2,11 +2,7 @@
 
 This is a sample server Petstore server. For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.
 
-<<<<<<< HEAD
 Generated by OpenAPI Generator 5.0.0-SNAPSHOT.
-=======
-Generated by OpenAPI Generator 4.3.1-SNAPSHOT.
->>>>>>> origin/master
 
 ## Requires
 
diff --git a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/.openapi-generator/VERSION b/samples/server/petstore/php-slim/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/php-slim/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-slim/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION
index b5d898602c..d99e7162d0 100644
--- a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION b/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/python-flask/.openapi-generator/VERSION b/samples/server/petstore/python-flask/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/python-flask/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-flask/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
index f22796ce40..a9b716d1b2 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
index 04de44c740..7565fed6e0 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 54dd2fbf8a..b074d8ed6b 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
index a89e60f751..f7e197175d 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
index edea29eed3..602204ea56 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
index e965b58035..55e566b7b3 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 079817de1b..4236103bf6 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
index 2696e919c4..4a20a07cc8 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5835e07633..1f419fa0a6 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
index 39a7efa74c..761a570551 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
index 6a221ac130..26bb1a8482 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
index 3c864b4b4b..23205a5d72 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 814b1ed71d..579bd42634 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
index c582282e4e..bc3377a9b2 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5577a3f59d..d144c94bfd 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
index a6bc3361ee..cd5cc378fb 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
index f2e3d5bef9..5d9b575d98 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
index 1cfc13a1ba..d8a1580f8d 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 814b1ed71d..579bd42634 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
index c582282e4e..bc3377a9b2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5577a3f59d..d144c94bfd 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
index a6bc3361ee..cd5cc378fb 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
index f2e3d5bef9..5d9b575d98 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
index 1cfc13a1ba..d8a1580f8d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 1f911460d6..67fbd51d9b 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
index e8e3fed18f..39cf5fafcb 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index cecbfb49b3..c955e7d315 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
index efc8c00126..5a95459a8b 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
index 65c1a5adfc..b703bff5c2 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
index 04d2d9aec0..715c941bd8 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 814b1ed71d..579bd42634 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index c582282e4e..bc3377a9b2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5577a3f59d..d144c94bfd 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
index a6bc3361ee..cd5cc378fb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index f2e3d5bef9..5d9b575d98 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
index 1cfc13a1ba..d8a1580f8d 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 3cfe42ed12..1e7104c0b3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 03a0e4acb1..5b58fef15d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b2125facae..969c419ca9 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
index dfb7d2e7e5..0309ce43c7 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index e17cf619ee..a87f92e8c3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
index 02a494a63c..c972d1c204 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 7053dc100f..7faf2b8b83 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index d918c674c8..35f610b564 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 0257ff4e90..7121790c11 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
index f38c15833e..c5ae36f2e5 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
index 490c5e8d93..6495db3d58 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
index 4a426d4b11..157885f7e3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 079817de1b..4236103bf6 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index 5d9561c97d..010976dd07 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5835e07633..1f419fa0a6 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
index 66dfac2277..f37027548d 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
index 6a221ac130..26bb1a8482 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
index 3c864b4b4b..23205a5d72 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
index 0be1fe667f..720a33e181 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
index f5930bcf21..291fc16340 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
index 6c29a008ea..25944a0801 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
index 008eeeea6b..9007dfdcd4 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
index 20570b3365..5357922683 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
index 6499ecfef1..017f2b63a3 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION
index ad755aed74..d99e7162d0 100644
--- a/samples/server/petstore/springboot/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 079817de1b..4236103bf6 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
index f13ca340fc..0f71e3ab94 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5835e07633..1f419fa0a6 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
index 39a7efa74c..761a570551 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index 6a221ac130..26bb1a8482 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
index 3c864b4b4b..23205a5d72 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */