diff --git a/.gitconfig b/.gitconfig
index a44d5d2..8ec8a94 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,3 +20,9 @@
 	autocrlf = input
 [init]
 	defaultBranch = main
+[merge]
+	tool = nvim
+[mergetool]
+	keepBackup = false
+[mergetool "nvim"]
+	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'