test merge error