fix small merge error