map merge bug fix