diff --git a/LLVM.lock b/LLVM.lock
index d400a48b..9b393bc3 100644
--- a/LLVM.lock
+++ b/LLVM.lock
@@ -1,6 +1,2 @@
 url = "https://github.com/matter-labs/era-compiler-llvm"
-<<<<<<< HEAD
-branch = "v1.4.1"
-=======
 branch = "main"
->>>>>>> d020375 (Final sync with the private repo)