merge --no-ff default