diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5ff8c5f2..c9b4892a 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -162,3 +162,7 @@
 [Mr-Helpful](https://github.com/Mr-Helpful)
 
 - Corrects pin names used for nvim themes
+
+[Libadoxon](https://github.com/Libadoxon)
+
+- Add [git-conflict](https://github.com/akinsho/git-conflict.nvim) plugin for resolving git conflicts
diff --git a/modules/plugins/git/default.nix b/modules/plugins/git/default.nix
index 525cbcf7..6ed92217 100644
--- a/modules/plugins/git/default.nix
+++ b/modules/plugins/git/default.nix
@@ -4,6 +4,7 @@ in {
   imports = [
     ./gitsigns
     ./vim-fugitive
+    ./git-conflict
   ];
 
   options.vim.git = {
@@ -13,6 +14,7 @@ in {
       Enabling this option will enable the following plugins:
       * gitsigns
       * vim-fugitive
+      * git-conflict
     '';
   };
 }
diff --git a/modules/plugins/git/git-conflict/config.nix b/modules/plugins/git/git-conflict/config.nix
new file mode 100644
index 00000000..266c9c87
--- /dev/null
+++ b/modules/plugins/git/git-conflict/config.nix
@@ -0,0 +1,41 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.git.git-conflict;
+
+  self = import ./git-conflict.nix {inherit lib config;};
+  gcMappingDefinitions = self.options.vim.git.git-conflict.mappings;
+
+  gcMappings = addDescriptionsToMappings cfg.mappings gcMappingDefinitions;
+in {
+  config = mkIf cfg.enable (mkMerge [
+    {
+      vim = {
+        startPlugins = [pkgs.vimPlugins.git-conflict-nvim];
+
+        maps = {
+          normal = mkMerge [
+            (mkSetBinding gcMappings.ours "<Plug>(git-conflict-ours)")
+            (mkSetBinding gcMappings.theirs "<Plug>(git-conflict-theirs)")
+            (mkSetBinding gcMappings.both "<Plug>(git-conflict-both)")
+            (mkSetBinding gcMappings.none "<Plug>(git-conflict-none)")
+            (mkSetBinding gcMappings.prevConflict "<Plug>(git-conflict-prev-conflict)")
+            (mkSetBinding gcMappings.nextConflict "<Plug>(git-conflict-next-conflict)")
+          ];
+        };
+
+        pluginRC.git-conflict = entryAnywhere ''
+          require('git-conflict').setup(${toLuaObject ({default_mappings = false;} // cfg.setupOpts)})
+        '';
+      };
+    }
+  ]);
+}
diff --git a/modules/plugins/git/git-conflict/default.nix b/modules/plugins/git/git-conflict/default.nix
new file mode 100644
index 00000000..89093a72
--- /dev/null
+++ b/modules/plugins/git/git-conflict/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./git-conflict.nix
+  ];
+}
diff --git a/modules/plugins/git/git-conflict/git-conflict.nix b/modules/plugins/git/git-conflict/git-conflict.nix
new file mode 100644
index 00000000..bffb926c
--- /dev/null
+++ b/modules/plugins/git/git-conflict/git-conflict.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.binds) mkMappingOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.git.git-conflict = {
+    enable = mkEnableOption "git-conflict" // {default = config.vim.git.enable;};
+    setupOpts = mkPluginSetupOption "git-conflict" {};
+
+    mappings = {
+      ours = mkMappingOption "Choose Ours [Git-Conflict]" "co";
+      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct";
+      both = mkMappingOption "Choose Both [Git-Conflict]" "cb";
+      none = mkMappingOption "Choose None [Git-Conflict]" "c0";
+      prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
+      nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
+    };
+  };
+}