test merge with --no-ff