diff --git a/download/translategame/clickheretorun.bat b/download/translategame/clickheretorun.bat
index 1a11f5a..02891ec 100644
--- a/download/translategame/clickheretorun.bat
+++ b/download/translategame/clickheretorun.bat
@@ -1,6 +1,2 @@
 java -jar translategame.jar
-<<<<<<< HEAD
 pause
-=======
-pause
->>>>>>> 70a04030cf56b2a4039aef6d7d309b11c216d42d