diff --git a/.gitconfig b/.gitconfig
index 8eb371b..f0a497a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,3 +28,5 @@
 	directory = /opt/homebrew
 [init]
 	defaultBranch = main
+[merge]
+	conflictstyle = diff3