[fix] [minor] merge conflict fix