diff --git a/config/git/config b/config/git/config
index 50a8581..479ca37 100644
--- a/config/git/config
+++ b/config/git/config
@@ -53,7 +53,7 @@ pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(
 layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE
 
 [merge]
-conflictStyle = diff3
+conflictStyle = zdiff3
 summary = true
 verbosity = 1
 tool = nvimdiff