diff --git a/git/config b/git/config
index 3497ed8..d1121c4 100644
--- a/git/config
+++ b/git/config
@@ -40,8 +40,6 @@
 	diffFilter = delta --color-only
 [log]
 	date = human
-[merge]
-	conflictStyle = zdiff3
 [pull]
 	rebase = true
 [push]