diff --git a/git/config b/git/config
index edc0cbc..bb5a9cc 100644
--- a/git/config
+++ b/git/config
@@ -25,3 +25,5 @@
 
 [includeIf "gitdir:~/projects/"]
 	path = config-personal
+[merge]
+	conflictStyle = diff3