diff --git a/home/.config/git/config b/home/.config/git/config
index 80168b1..ff052d5 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -20,10 +20,11 @@
 
 [merge]
 	prompt = false
+  conflictstyle = diff3
 	tool = nvim-merge
 
 [mergetool "nvim-merge"]
-	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 	keepBackup = false
 
 [diff]
@@ -50,3 +51,6 @@
 [credential]
 	helper = cache --timeout=600
 	helper = !pass-git-helper $@
+
+[rerere]
+  enabled = true