diff --git a/gitconfig b/gitconfig
index 875c8ec..deff0d5 100644
--- a/gitconfig
+++ b/gitconfig
@@ -36,7 +36,6 @@
 [color]
     ui = auto
 [merge]
-    conflictstyle = zdiff3
     stat = true
 [rebase]
     autosquash = true