diff --git a/modules/plugins/git/git-conflict/config.nix b/modules/plugins/git/git-conflict/config.nix
index 266c9c87..bc9905d6 100644
--- a/modules/plugins/git/git-conflict/config.nix
+++ b/modules/plugins/git/git-conflict/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
@@ -19,7 +18,7 @@ in {
   config = mkIf cfg.enable (mkMerge [
     {
       vim = {
-        startPlugins = [pkgs.vimPlugins.git-conflict-nvim];
+        startPlugins = ["git-conflict-nvim"];
 
         maps = {
           normal = mkMerge [
diff --git a/npins/sources.json b/npins/sources.json
index 9bd3f725..82eb60d4 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -423,6 +423,18 @@
       "url": "https://github.com/notomo/gesture.nvim/archive/dbd839bda337cb73911aeef06897eb29cb99f76f.tar.gz",
       "hash": "1cqiahc52xh113l8lgpz3k852vvqkv2srj9shdkyya76a2v2sf9d"
     },
+    "git-conflict-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "akinsho",
+        "repo": "git-conflict.nvim"
+      },
+      "branch": "main",
+      "revision": "a1badcd070d176172940eb55d9d59029dad1c5a6",
+      "url": "https://github.com/akinsho/git-conflict.nvim/archive/a1badcd070d176172940eb55d9d59029dad1c5a6.tar.gz",
+      "hash": "05rnwhm1fmg3yb7j2xc9nmw262jc687qxhwabn97qarrk2da0r0a"
+    },
     "gitsigns-nvim": {
       "type": "Git",
       "repository": {
@@ -2044,4 +2056,4 @@
     }
   },
   "version": 3
-}
+}
\ No newline at end of file