Resolve the conflict
update NerTagPickerTest