diff --git a/gitconfig b/gitconfig
index 23792f4..bd92cd8 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,3 +3,5 @@
 	email = colin@semicolin.games
 [init]
 	defaultBranch = main
+[merge]
+	conflictstyle = diff3