diff --git a/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb b/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb
index 0186bed4afc..d868c5d2d2a 100644
--- a/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb
+++ b/samples/client/petstore/ruby-autoload/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb b/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb
index 8a5ef87a194..953082dadf1 100644
--- a/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb
+++ b/samples/client/petstore/ruby-autoload/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-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 b419fa527aa..5f9edeea2ee 100644
--- a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb
+++ b/samples/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb
index 1acba3fb98a..82ed3651933 100644
--- a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb
+++ b/samples/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-httpx/spec/api_client_spec.rb b/samples/client/petstore/ruby-httpx/spec/api_client_spec.rb
index 2a18cd29584..8018829bd16 100644
--- a/samples/client/petstore/ruby-httpx/spec/api_client_spec.rb
+++ b/samples/client/petstore/ruby-httpx/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/client/petstore/ruby-httpx/spec/configuration_spec.rb b/samples/client/petstore/ruby-httpx/spec/configuration_spec.rb
index 72e7d8d38cd..6fa105239c7 100644
--- a/samples/client/petstore/ruby-httpx/spec/configuration_spec.rb
+++ b/samples/client/petstore/ruby-httpx/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-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 0186bed4afc..d868c5d2d2a 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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-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 8a5ef87a194..953082dadf1 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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb
index 93a6e02ef00..ee5e693c1c6 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb
index 3a550041761..a7d5c6d3e7d 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb
index c602ad7cc0f..69053d32a85 100644
--- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb
+++ b/samples/openapi3/client/features/dynamic-servers/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb
index 107d581f2b9..fb5730f6cd7 100644
--- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb
+++ b/samples/openapi3/client/features/dynamic-servers/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb
index a4a56786c78..5b5d5f35cab 100644
--- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb
+++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end
 
diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb
index c9d70a698a1..b4415c7cbf9 100644
--- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb
+++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/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: 8.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 7.2.0-SNAPSHOT
->>>>>>> origin/master
 
 =end