diff --git a/home/dot_config/git/config b/home/dot_config/git/config
index a694e02..8485294 100644
--- a/home/dot_config/git/config
+++ b/home/dot_config/git/config
@@ -41,7 +41,7 @@
     path = /home/max/.config/git/config-esl
 [merge]
     conflictStyle = zdiff3
-    ff = true
+    ff = false
     tool = vimdiff
 [mergetool "vimdiff"]
     cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'