diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 42497af..c3546e1 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -48,7 +48,7 @@ in
         userEmail = cfg.identity.email;
         extraConfig = {
           init.defaultBranch = "main";
-          merge.conflictstyle = "diff3";
+          merge.conflictstyle = "zdiff3";
         };
         delta.enable = true;
         signing = mkIf cfg.signing {