diff --git a/flake.lock b/flake.lock
index 5dff72c0..d469c66e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -264,11 +264,19 @@
         ]
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1719327780,
         "narHash": "sha256-dA5mQinY/VKxzhgMz6oPGUXCS660RWAtherW7B0+aAk=",
         "ref": "refs/heads/master",
         "rev": "c60fc43f733fb0368529e72f5e07c424b30055fb",
         "revCount": 15,
+=======
+        "lastModified": 1721034873,
+        "narHash": "sha256-3Bpj3h2UHXgBwlVm+jB5qCLtbn42LunCIEDg1IX111M=",
+        "ref": "refs/heads/master",
+        "rev": "a4a9bf571de0880621739228358a5d31e4c14d43",
+        "revCount": 16,
+>>>>>>> 66cf83c ([tasklist] update)
         "type": "git",
         "url": "https://git.dynamicdiscord.de/kalipso/tasklist"
       },