added typeahead
fixed conflic