merge error fixing