Make no-ff merges default