test merge conflicts