resloved merge error