try to merge in the map page
resolved a simple conflict..