small merge error