diff --git a/dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua
index 43889ec..1e696b9 100644
--- a/dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua
+++ b/dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua
@@ -1,4 +1,5 @@
 return {
+  {'akinsho/git-conflict.nvim', version = "*", config = true},
   {
     "kdheepak/lazygit.nvim",
     lazy = true,