diff --git a/home/common.nix b/home/common.nix
index 2034fce..4d34941 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -106,7 +106,7 @@
           .kakrc
         ''}";
         safe.directory = "*";
-        merge.conflictstyle = "diff3";
+        merge.conflictstyle = "zdiff3";
       };
     };