some merge issue