Fix some merge issue