make no-ff default for merges