diff --git a/.config/git/config b/.config/git/config
index b6dcd76117c589c73af06eb0c43b6777dc4b91e2..08bc4c39d281f482e787549b04bd12a4f0347be3 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -76,6 +76,7 @@
     defaultBranch = master
 
 [merge]
+    conflictstyle = zdiff3
     ff = false
     tool = meld