diff --git a/config/git/config b/config/git/config
index 713e963..34e0623 100644
--- a/config/git/config
+++ b/config/git/config
@@ -46,7 +46,7 @@
 	autoStash = true
 	updateRefs = true
 [merge]
-	conflictstyle = zdiff3
+	conflictStyle = diff3
 [pull]
 	rebase = true
 [color "diff-highlight"]