diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py
index be2de94..ae425c2 100755
--- a/python_tools/void_python_tools/backend/launchers.py
+++ b/python_tools/void_python_tools/backend/launchers.py
@@ -297,8 +297,12 @@ def launchPrune(sample, binPath, thisDataPortion=None,
     cmd += " >& " + logFile
     os.system(cmd)
 
+<<<<<<< HEAD
     if jobSuccessful(logFile, "NetCDF: Not a valid ID\n") or \
        jobSuccessful(logFile, "Done!"):
+=======
+    if jobSuccessful(logFile, "NetCDF: Not a valid ID\n") or jobSuccessful(logFile, "Done!\n"):
+>>>>>>> 3d6fae9882fde44515a59e1144646d77bbd1a124
       print "done"
     else:
       print "FAILED!"