merge error byebye