diff --git a/vcs/git/config/git/config b/vcs/git/config/git/config
index 013cf64..1bfc097 100644
--- a/vcs/git/config/git/config
+++ b/vcs/git/config/git/config
@@ -11,7 +11,7 @@
 [interactive]
   diffFilter    = git delta --color-only
 [merge]
-  conflictstyle = diff3
+  conflictStyle = zdiff3
 [delta]
   navigate      = true
   line-numbers  = true