diff --git a/dot_config/git/config b/dot_config/git/config
index c8ce0bb..409ef60 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -14,7 +14,7 @@
   minRacyThreshold = 6379 microseconds
 [merge]
   tool = meld
-  conflictstyle = zdiff3
+  conflictstyle = diff3
 [review "review.lineageos.org"]
   username = jbeckmeyer
 [filter "lfs"]