merged conflicts
removed dependencies on geocoder