diff --git a/scripts/build.sh b/scripts/build.sh
index be69f801d..b64c177d6 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,5 +1 @@
 cargo build --profile production --features "metadata-hash"
-<<<<<<< HEAD
-
-=======
->>>>>>> f37d9c1b (fix node dep on runtime-benchmarks)