[fix] [minor] fixed merging issue