diff --git a/src/apps/personal/vim.nix b/src/apps/personal/vim.nix
index 16481de..f97c31e 100644
--- a/src/apps/personal/vim.nix
+++ b/src/apps/personal/vim.nix
@@ -71,6 +71,8 @@
             enable = true,
           },
         }
+
+        require('git-conflict').setup()
       EOF
     '';