diff --git a/home/programs/git.nix b/home/programs/git.nix
index bcb9e47..f3b43de 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -40,6 +40,10 @@
         whitespace = "fix";
       };
 
+      merge = {
+        conflictStyle = "zdiff3";
+      };
+
       rerere = {
         enabled = true;
       };