diff --git a/flake.lock b/flake.lock
index 9cf0b55..1b18334 100644
--- a/flake.lock
+++ b/flake.lock
@@ -390,11 +390,19 @@
         ]
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1723852814,
         "narHash": "sha256-P0mYUxYH097oG5x0n84qABgk2tQfBLznwd1TGh5vgnk=",
         "ref": "main",
         "rev": "8de8ac0e086187a749c719893f3aa9c460978f9a",
         "revCount": 1462,
+=======
+        "lastModified": 1724050814,
+        "narHash": "sha256-THf50ZcBPY6r7/cyvE8bxYDvrctHrWbYaMx4udr4OUM=",
+        "ref": "main",
+        "rev": "7628c26fd92f684ab5c7572c63de4af8b4b3a7b4",
+        "revCount": 1464,
+>>>>>>> d6d2aaa32916095c3e7e4aaafc1ffedea82095e8
         "type": "git",
         "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab"
       },