diff --git a/flake.lock b/flake.lock
index 77bcd99..aab2d03 100644
--- a/flake.lock
+++ b/flake.lock
@@ -149,19 +149,11 @@
     },
     "nixpkgs": {
       "locked": {
-<<<<<<< HEAD
         "lastModified": 1711738046,
         "narHash": "sha256-J7/vq+qaf2gZPPKAH+dK9pZAwR6wxuOVNozRQoAstHQ=",
         "owner": "geekygays",
         "repo": "nixpkgs",
         "rev": "9b978713e26536cbc555ac33c4a4b1733a7c3eae",
-=======
-        "lastModified": 1711712949,
-        "narHash": "sha256-8/qCHYhBTQx7rg65cXE8hOOCIvazEm+VnoFaSzZctMw=",
-        "owner": "geekygays",
-        "repo": "nixpkgs",
-        "rev": "c81d1240f87279aacaad75b0ee73ef395325f855",
->>>>>>> a50c0a316efe8a36ab5b01db9bcd0a388ec41b8b
         "type": "github"
       },
       "original": {