diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml
index e141bc5e369..79cee1afe0c 100644
--- a/samples/meta-codegen/lib/pom.xml
+++ b/samples/meta-codegen/lib/pom.xml
@@ -121,11 +121,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
         <openapi-generator-version>6.0.0-SNAPSHOT</openapi-generator-version>
-=======
-        <openapi-generator-version>5.3.1-SNAPSHOT</openapi-generator-version>
->>>>>>> origin/5.4.x
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>
     </properties>
diff --git a/samples/meta-codegen/usage/.openapi-generator/VERSION b/samples/meta-codegen/usage/.openapi-generator/VERSION
index f03177fda63..5f68295fc19 100644
--- a/samples/meta-codegen/usage/.openapi-generator/VERSION
+++ b/samples/meta-codegen/usage/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-6.0.0-SNAPSHOT
-=======
-5.3.1-SNAPSHOT
->>>>>>> origin/5.4.x
+6.0.0-SNAPSHOT
\ No newline at end of file