Added address autocomplete
resolved a conflict