diff --git a/defaults/git.nix b/defaults/git.nix
index 564517a..94d5861 100644
--- a/defaults/git.nix
+++ b/defaults/git.nix
@@ -30,7 +30,6 @@ in
 
         push.autoSetupRemote = true;
 
-        merge.conflictStyle = "zdiff3"; # easiest to understand style
         commit.verbose = true; # show diffs in commit editor
       };
     };