diff --git a/slapos/tests/slapgrid.py b/slapos/tests/slapgrid.py
index 8822d49a28ebf667ec0d046d48e01496ee25c740..44dabdf36c5b8a9400d583b2a34dc45f4a58880f 100644
--- a/slapos/tests/slapgrid.py
+++ b/slapos/tests/slapgrid.py
@@ -1170,17 +1170,10 @@ fi""" % {'worked_file': worked_file, 'lockfile': lockfile})
       with open(promise, 'w') as f:
         f.write("""#!/usr/bin/env sh
 touch "%(worked_file)s"
-<<<<<<< HEAD
 if [ ! -f %(lockfile)s ]
 then
   touch "%(lockfile)s"
 else
-=======
-if [ ! -f %(lockfile)s ] 
-then
-  touch "%(lockfile)s" 
-else 
->>>>>>> master
   sleep 5
 fi
 exit 0"""  % {'worked_file': worked_file, 'lockfile': lockfile})