Updated my location in map. Fixed merge problems.