fix small merge issue