Geolocation working on phone and web
Fixed merge conflicts