diff --git a/MobArena.jar b/MobArena.jar
index 5cfaf84..903c370 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/bin/plugin.yml b/bin/plugin.yml
index 3b10de3..d7dc33e 100644
--- a/bin/plugin.yml
+++ b/bin/plugin.yml
@@ -1,10 +1,6 @@
 name: MobArena
 main: com.garbagemule.MobArena.MobArena
-<<<<<<< HEAD
 version: 0.93.2
-=======
-version: 0.93.1
->>>>>>> da8c77082ed69d7d4ebc00cdfd480fa7df67c2ad
 softdepend: [MultiVerse,XcraftGate]
 commands:
   ma: