removed merge error