diff --git a/git/.gitconfig b/git/.gitconfig
index 8943757..026359a 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -11,5 +11,9 @@
 	smtpserver = /usr/bin/msmtp
 [http]
 	sslVerify = false
-[alias]
-	conflicted = !vim +Conflicted
+[merge]
+	tool = vim_mergetool
+	conflictstyle=diff3
+[mergetool "vim_mergetool"]
+	cmd = nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
+	trustExitCode = true