Fixed map
Fixed conflict