diff --git a/git/gitconfig.include b/git/gitconfig.include
index 28f03c1..ab3badf 100644
--- a/git/gitconfig.include
+++ b/git/gitconfig.include
@@ -20,7 +20,8 @@
 [diff]
 	tool = vimdiff
 [merge]
-	tool = meld
+	tool = vimdiff
+	conflictstyle = diff3
 [mergetool]
 	keepBackup = false
 [credential]