diff --git a/pom.xml b/pom.xml
index 7f3e399..2efd14e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,8 @@
 
     <groupId>de.viper</groupId>
     <artifactId>SurvivalPlus</artifactId>
-<<<<<<< HEAD
     <version>1.0.7-Beta</version>
-=======
-    <version>1.0.6-Beta</version>
->>>>>>> aadc1e75cc9b97929c3cde4fa3d098d281ba32f7
+
     <packaging>jar</packaging>
 
     <name>SurvivalPlus</name>