attempt at geolocation
fixed conflicts