map merge fix