diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 140a90f096..e60530fd78 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -881,8 +881,5 @@ rm -rf "$OUT_OF_SOURCE_DIR"
 
 msg "Done, cleaning up"
 cleanup
-<<<<<<< HEAD
-=======
 
 final_report
->>>>>>> development-restricted