No longer make --no-ff the default merge