Remove merge error