diff --git a/module-base/pom.xml b/module-base/pom.xml
index ed15763..9471170 100644
--- a/module-base/pom.xml
+++ b/module-base/pom.xml
@@ -3,12 +3,8 @@
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-workflow-wu-wma-import</artifactId>
-<<<<<<< HEAD
     <version>24.11-SNAPSHOT</version>
-=======
-    <version>24.10-SNAPSHOT</version>
->>>>>>> working
   </parent>
   <artifactId>plugin-workflow-wu-wma-import-base</artifactId>
   <packaging>jar</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/module-gui/pom.xml b/module-gui/pom.xml
index 165b274..61f24ef 100644
--- a/module-gui/pom.xml
+++ b/module-gui/pom.xml
@@ -3,11 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-workflow-wu-wma-import</artifactId>
-<<<<<<< HEAD
     <version>24.11-SNAPSHOT</version>
-=======
-    <version>24.10-SNAPSHOT</version>
->>>>>>> working
   </parent>
   <artifactId>plugin-workflow-wu-wma-import-gui</artifactId>
   <packaging>jar</packaging>
@@ -19,4 +15,4 @@
       </resource>
     </resources>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 74f0e89..71586d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow</groupId>
     <artifactId>workflow-base</artifactId>
-<<<<<<< HEAD
     <version>24.11-SNAPSHOT</version>
-=======
-    <version>24.10-SNAPSHOT</version>
->>>>>>> working
     <relativePath />
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>
@@ -31,4 +27,4 @@
       <classifier>classes</classifier>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>