diff --git a/shared/home/default.nix b/shared/home/default.nix
index 1debef8..e9b0b27 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -153,7 +153,7 @@ in {
         extraConfig = {
           rerere.enabled = true;
           pull.ff = "only";
-          merge.conflictstyle = "diff3";
+          merge.conflictstyle = "zdiff3";
           init.defaultBranch = "main";
         };
       };