diff --git a/git/.gitconfig b/git/.gitconfig
index de3b8aa..8c3a206 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -26,15 +26,12 @@
 [difftool "kitty"]
     cmd = kitty +kitten diff $LOCAL $REMOTE
 [merge]
-	tool = diffconflicts
+	tool = nvimdiff1
 	conflictstyle = zdiff3
 	ff = only
 [mergetool]
 	prompt = false
 	keepBackup = false
-[mergetool "diffconflicts"]
-	cmd = nvim -c DiffConflicts $MERGED $BASE $LOCAL $REMOTE
-	trustExitCode = true
 [rebase]
 	autosquash = true
 	autoStash = true