diff --git a/home-manager/roles/default.nix b/home-manager/roles/default.nix
index ceb51ab6..bd6ea77d 100644
--- a/home-manager/roles/default.nix
+++ b/home-manager/roles/default.nix
@@ -67,6 +67,7 @@
       };
 
       extraConfig = {
+        merge.conflictStyle = "diff3";
         pull.ff = "only";
         core.editor = "vim";
         init.defaultBranch = "main";