diff --git a/scripts/build_linux_zig.sh b/scripts/build_linux_zig.sh
index 276ff84e..7e1bf5ba 100755
--- a/scripts/build_linux_zig.sh
+++ b/scripts/build_linux_zig.sh
@@ -235,7 +235,6 @@ cd ${BUILDDIR}
 #make install
 
 echo "::endgroup::"
-<<<<<<< HEAD
 #############
 # mpdecimal #
 #############
@@ -250,8 +249,6 @@ make -j4
 make install
 
 echo "::endgroup::"
-=======
->>>>>>> parent of 4b35623 (use shared libs instead)
 ##########
 # Python #
 ##########