diff --git a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/loot/LootModule.java b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/loot/LootModule.java
index 3b18690ce..9aa42e3ac 100644
--- a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/loot/LootModule.java
+++ b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/loot/LootModule.java
@@ -41,10 +41,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-<<<<<<< HEAD
-=======
 import org.bukkit.event.EventPriority;
->>>>>>> refs/remotes/origin/develop
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;