diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index fdb3de8..9521b17 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -40,7 +40,10 @@ in
         enable = true;
         userName = "Moritz Böhme";
         userEmail = "mail@moritzboeh.me";
-        extraConfig.init.defaultBranch = "main";
+        extraConfig = {
+          init.defaultBranch = "main";
+          merge.conflictstyle = "diff3";
+        };
         delta.enable = true;
         signing = mkIf cfg.signing {
           key = "0x970C6E89EB0547A9";