fixed the map merge