map added w/ geolocation
fixed conflict