diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 86aa4ca17269..582cda171e71 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -11715,6 +11715,18 @@ final: prev:
     meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/";
   };
 
+  telescope-git-conflicts-nvim = buildVimPlugin {
+    pname = "telescope-git-conflicts.nvim";
+    version = "2024-01-14";
+    src = fetchFromGitHub {
+      owner = "Snikimonkd";
+      repo = "telescope-git-conflicts.nvim";
+      rev = "1ac7040f601d16ab3800bdda6f5912a0e385cb29";
+      sha256 = "0n5jwc7pv14fipavqfvam5691qp9fvs2nksdaihjgqrgl5sd12jv";
+    };
+    meta.homepage = "https://github.com/Snikimonkd/telescope-git-conflicts.nvim/";
+  };
+
   telescope-github-nvim = buildVimPlugin {
     pname = "telescope-github.nvim";
     version = "2022-04-22";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index bb74c4a41733..453101e011ee 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2134,6 +2134,10 @@ in
     meta.platforms = lib.platforms.all;
   });
 
+  telescope-git-conflicts-nvim = super.telescope-git-conflicts-nvim.overrideAttrs {
+    dependencies = with self; [ telescope-nvim ];
+  };
+
   telescope-media-files-nvim = super.telescope-media-files-nvim.overrideAttrs {
     dependencies = with self; [
       telescope-nvim
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 4bb2712e70e3..987772e36724 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -982,6 +982,7 @@ https://github.com/nvim-telescope/telescope-frecency.nvim/,,
 https://github.com/nvim-telescope/telescope-fzf-native.nvim/,,
 https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,,
 https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
+https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,HEAD,
 https://github.com/nvim-telescope/telescope-github.nvim/,,
 https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD,
 https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,