Test for merge error resoution