Fixed map merge error