location autocompleter in home
merging
solving conflict