Merge with --no-ff as standard