diff --git a/tests/scripts/test_simulators.py b/tests/scripts/test_simulators.py
index 9492b83bc..4c13fee9d 100644
--- a/tests/scripts/test_simulators.py
+++ b/tests/scripts/test_simulators.py
@@ -199,15 +199,9 @@ with open(fname, 'w') as fp:
     Log(Fore.BLUE, 'General tests (results: ' + file_results + ')')
 
     try:
-<<<<<<< HEAD
-        killAllStaleProcesses(fp)
+        cleanup(fp)
         startGeneralTests(fp, file_results)
         
-=======
-        startGeneralTests(fp, file_results)
-        cleanup(fp)
-
->>>>>>> developer
         testError = False
         for server in servers:
             try: