diff --git a/.gear/rules b/.gear/rules
index 99dd28d7b..84617fa01 100644
--- a/.gear/rules
+++ b/.gear/rules
@@ -2,8 +2,4 @@
 # for version output.
 tar: b@version@:.
 diff: b@version@:. . name=@name@-@version@.patch
-<<<<<<< HEAD
-spec: .gear/llama.cpp.spec
-=======
-spec: .gear/llama-cpp-turboquant.spec
->>>>>>> 0591e57d
+spec: .gear/llama.cpp.spec
\ No newline at end of file