diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 0bb9b04..b3f1415 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -2410,7 +2410,6 @@
     make test
 }
 
-<<<<<<< HEAD
 component_test_no_strings () {
     msg "build: no strings" # ~10s
     scripts/config.py full