diff --git a/.gitconfig b/.gitconfig
index 1358d71..bd7a80b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,3 +10,5 @@
 		editor = vim
 [help]
 		autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
+[merge]
+	conflictStyle = diff3