diff --git a/flake.lock b/flake.lock
index 1b9badac6..594365fbc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -265,13 +265,8 @@
         "utils": "utils"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1736435446,
-        "narHash": "sha256-3e82deloDgZaV7hB8P6NfMEavRyrH/pB/E7AqWbxOs8=",
-=======
         "lastModified": 1736265310,
         "narHash": "sha256-4LLy5VMM5TK4LpQXEBiA8ziwYyqGx2ZAuunXGCDpraQ=",
->>>>>>> main
         "path": "src/mina",
         "type": "path"
       },