diff --git a/iso/empanadas/empanadas/scripts/sync-from-peridot-test.py b/iso/empanadas/empanadas/scripts/sync-from-peridot-test.py
index 0362718..023ba42 100755
--- a/iso/empanadas/empanadas/scripts/sync-from-peridot-test.py
+++ b/iso/empanadas/empanadas/scripts/sync-from-peridot-test.py
@@ -12,10 +12,6 @@ r.check_valid_arch()
 
 #a = RepoSync(rlvars, config, major="9", repo="ResilientStorage", parallel=True, ignore_debug=False, ignore_source=False)
 a = RepoSync(rlvars, config, major="9", repo="BaseOS", parallel=True, ignore_debug=False, ignore_source=False, hashed=True)
-<<<<<<< HEAD:iso/py/sync-from-peridot-test
-#a.run()
-=======
 
 def run():
     a.run()
->>>>>>> 8d29760 (Lets write some poetry):iso/empanadas/empanadas/scripts/sync-from-peridot-test.py