Be more specific about no-ff merges