diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION
index 332e1875af2..71d2eb1c7fc 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.2.3-SNAPSHOT
->>>>>>> origin/4.3.x
diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION
index 332e1875af2..71d2eb1c7fc 100644
--- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.2.3-SNAPSHOT
->>>>>>> origin/4.3.x