Another small change to test merge with --no-ff.