diff --git a/home/dot_config/git/config b/home/dot_config/git/config
index 952b443..c0a8ebb 100644
--- a/home/dot_config/git/config
+++ b/home/dot_config/git/config
@@ -8,6 +8,7 @@
     syntax-theme = Solarized (dark)
 [diff]
     colorMoved = default
+    tool = vimdiff
 [interactive]
     diffFilter = delta --color-only
 [color]
@@ -41,6 +42,9 @@
 [merge]
     conflictStyle = zdiff3
     ff = true
+    tool = vimdiff
+[mergetool "vimdiff"]
+    cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [push]
     default = simple
 [alias]
diff --git a/home/dot_config/nvim/lua/plugins/conflict-markers.lua b/home/dot_config/nvim/lua/plugins/conflict-markers.lua
new file mode 100644
index 0000000..403a48b
--- /dev/null
+++ b/home/dot_config/nvim/lua/plugins/conflict-markers.lua
@@ -0,0 +1,26 @@
+return {
+  "akinsho/git-conflict.nvim",
+  lazy = false,
+  opts = {
+    default_mappings = {
+      ours = "<leader>ho",
+      theirs = "<leader>ht",
+      none = "<leader>h0",
+      both = "<leader>hb",
+      next = "]x",
+      prev = "[x",
+    },
+  },
+  keys = {
+    {
+      "<leader>gx",
+      "<cmd>GitConflictListQf<cr>",
+      desc = "List Conflicts",
+    },
+    {
+      "<leader>gr",
+      "<cmd>GitConflictRefresh<cr>",
+      desc = "Refresh Conflicts",
+    },
+  },
+}