Merge master and SpeciousStationMap