diff --git a/.gitconfig b/.gitconfig
index 3cc18ba..c9e6052 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -26,5 +26,3 @@
     ui = true
 [branch]
     autosetuprebase = always
-[merge]
-	ff = false