diff --git a/src/main/java/com/fossgalaxy/games/fireworks/NetClient.java b/src/main/java/com/fossgalaxy/games/fireworks/NetClient.java
index ae3902f2c4a8e6f0be0b3b85af2b29f10282b59c..0d301cbad6a3c67844f24eeb2c7f14178c0ca15f 100644
--- a/src/main/java/com/fossgalaxy/games/fireworks/NetClient.java
+++ b/src/main/java/com/fossgalaxy/games/fireworks/NetClient.java
@@ -3,12 +3,9 @@ package com.fossgalaxy.games.fireworks;
 import com.fossgalaxy.games.fireworks.human.ui.UIPlayer;
 import com.fossgalaxy.games.fireworks.human.ui.pretty.HumanUIAgent;
 import com.fossgalaxy.games.fireworks.state.actions.Action;
-<<<<<<< HEAD
-=======
-import com.fossgalaxy.games.fireworks.utils.AgentUtils;
+
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
->>>>>>> 9aaf132de70623e8adea5f7abf440cc42f8bed50
 
 
 import java.io.IOException;