updated map location
fixed conflicts