diff --git a/plugins/default.nix b/plugins/default.nix
index 254cea00..d71bd429 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -21,7 +21,6 @@
     ./git/gitmessenger.nix
     ./git/gitsigns.nix
     ./git/neogit.nix
-
     ./languages/clangd-extensions.nix
     ./languages/ledger.nix
     ./languages/markdown-preview.nix
@@ -57,7 +56,10 @@
     ./utils/endwise.nix
     ./utils/floaterm.nix
     ./utils/goyo.nix
+    <<<<<<< HEAD
     ./utils/harpoon.nix
+    =======
+    >>>>>>> origin/main
     ./utils/indent-blankline.nix
     ./utils/intellitab.nix
     ./utils/mark-radar.nix