more test merge conflicts