diff --git a/config b/config
index c9d48f7..e6e5e3a 100644
--- a/config
+++ b/config
@@ -40,11 +40,6 @@
 [help]
 	autocorrect = -1
 
-[merge]
-	tool = vimdiff
-	conflictstyle = diff3
-	prompt = false
-
 [pager]
 	status = true