diff --git a/common/home_manager/common.nix b/common/home_manager/common.nix
index eb2e9ce..4da2b33 100644
--- a/common/home_manager/common.nix
+++ b/common/home_manager/common.nix
@@ -38,6 +38,7 @@
         extraConfig = {
           init = { defaultBranch = "mistress"; };
           core = { editor = "hx"; };
+          merge.conflictStyle = "zdiff3";
           rebase.autosquash = true;
           pull.rebase = true;
         };