merge error resolved