diff --git a/git/default.nix b/git/default.nix
index 1b18073..b901b27 100644
--- a/git/default.nix
+++ b/git/default.nix
@@ -62,8 +62,11 @@
 
         log.date = "relative";
 
-        merge.ff = false;
-        merge.tool = "nvim";
+        merge = {
+          conflictstyle = "zdiff3";
+          ff = false;
+          tool = "nvim";
+        };
 
         mergetool.nvim.cmd = "nvim -d $BASE $LOCAL $REMOTE $MERGED -c 'DiffviewOpen'";
         mergetool.nvim.trustExitCode = false;