diff --git a/.gitconfig b/.gitconfig
index 6c0ef55e..61ac29a3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -88,6 +88,7 @@
 	enabled = true
 	autoUpdate = true
 [branch]
+	autoSetupMerge = simple
 	sort = -committerdate
 [log]
 	follow = true
@@ -132,8 +133,6 @@
 	keepBackup = false
 [mergetool "vimdiff"]
 	path = nvim
-[mergetool "nvimdiff"]
-	cmd = nvim -d \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true