added manual geolocation to user page
attempting to resolve merge conflict