fix(typeahead): merge issue