diff --git a/git/config b/git/config
index 5a2cdb9..7c8084a 100644
--- a/git/config
+++ b/git/config
@@ -7,7 +7,5 @@
 	default = simple
 [alias]
     lg = log --oneline --graph --decorate
-[merge]
-	ff = false
 [credential]
 	helper = cache