diff --git a/.config/git/config b/.config/git/config
index edef4df..f6307db 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -87,6 +87,7 @@
 [log]
 	follow = true
 [merge]
+	conflictstyle = diff3
 	log = true
 	suppressDest = *
 [pretty]