changed default location to geolocation
fixed merge conflicts