merge latest map changes