fixed map merging