adding GeoLocation
resolving geolocation conflict