--no-ff merges