diff --git a/defaults/git.nix b/defaults/git.nix
index 215e5ed..b90c35a 100644
--- a/defaults/git.nix
+++ b/defaults/git.nix
@@ -31,8 +31,13 @@ in
         credential.helper = "cache";
 
         push.autoSetupRemote = true;
+
+        # otherwise git suggests changing the config
+        # which two people I know have done without understanding
+        # causing further problems
         pull.ff = "only";
-        merge.conflictStyle = "zdiff3";
+
+        merge.conflictStyle = "zdiff3"; # easiest to understand style
         commit.verbose = true; # show diffs in commit editor
       }
       // (lib.optionalAttrs (superCfg.delta.enable && config.nixowos.allowAddingPackages) {