diff --git a/flake.lock b/flake.lock
index 31bb89c..30b19da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,19 +2,11 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1642044102,
-        "narHash": "sha256-GjDR4EmJw+OUCapU8Lx4VqKsycfr9Kd1gbeHL32q0jM=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "7b47359a8007a77b36c8bc2484930f988333f3ce",
-=======
         "lastModified": 1642414078,
         "narHash": "sha256-izmKOQGC3nttxqnpgJZo6IoR/ZNto9u12ToFRdEwL4Y=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
         "rev": "cda8c68fe3dabd1cfd8b9621564d3088d0bcb071",
->>>>>>> edea0b8 (FLAKE upd)
         "type": "github"
       },
       "original": {