autocomplete loc selection
Merge conflict resolved