updated map
merge