diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index fe0bd95..10c4543 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,9 +1,6 @@
 name: SurvivalPlus
-<<<<<<< HEAD
 version: 1.0.7
-=======
-version: 1.0.6
->>>>>>> aadc1e75cc9b97929c3cde4fa3d098d281ba32f7
+
 main: de.viper.survivalplus.SurvivalPlus
 api-version: 1.21
 softdepend: [LuckPerms, PlaceholderAPI]