diff --git a/git/config b/git/config
index 25baf00..8d61f56 100644
--- a/git/config
+++ b/git/config
@@ -36,7 +36,7 @@ defaultBranch = main
 date = iso
 
 [merge]
-conflictStyle = diff3
+conflictStyle = zdiff3
 ff = only
 tool = nvimdiff