diff --git a/home/common.nix b/home/common.nix
index ad43c9b..95a0e92 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -150,6 +150,7 @@ in
           .envrc
           .kakrc
         ''}";
+        merge.conflictstyle = "diff3";
       };
     };