test merge and conflict