Revert "Implove merge strategies setting"

This reverts commit 89e7a271c4942e2689f45d5dacf45bad2d04fc3e.
Alias `mf` to `merge --ff-only`