diff --git a/git/.gitconfig b/git/.gitconfig
index 2b6ec18..de3b8aa 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -27,7 +27,7 @@
     cmd = kitty +kitten diff $LOCAL $REMOTE
 [merge]
 	tool = diffconflicts
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 	ff = only
 [mergetool]
 	prompt = false