diff --git a/build.sh b/build.sh
index 8b3aad2580..a95cb8ee23 100755
--- a/build.sh
+++ b/build.sh
@@ -29,10 +29,6 @@ HELP="$0 [<target> ...] [<flag> ...] [--cmake-args=\"<args>\"] [--cache-tool=<to
    docs             - build the documentation
    tests            - build the tests
    bench-prims      - build micro-benchmarks for primitives
-<<<<<<< HEAD
-=======
-   template         - build the example RAFT application template
->>>>>>> branch-24.12
 
  and <flag> is:
    -v                          - verbose build mode