diff --git a/samples/client/petstore/elm-0.18/.openapi-generator/VERSION b/samples/client/petstore/elm-0.18/.openapi-generator/VERSION
index 92a8e296fac..71d2eb1c7fc 100644
--- a/samples/client/petstore/elm-0.18/.openapi-generator/VERSION
+++ b/samples/client/petstore/elm-0.18/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.0-SNAPSHOT
->>>>>>> 4.3.x
diff --git a/samples/client/petstore/elm/.openapi-generator/VERSION b/samples/client/petstore/elm/.openapi-generator/VERSION
index 92a8e296fac..71d2eb1c7fc 100644
--- a/samples/client/petstore/elm/.openapi-generator/VERSION
+++ b/samples/client/petstore/elm/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.0-SNAPSHOT
->>>>>>> 4.3.x