changes for autocomplete
resolving conflict