merge commit

conflict in map
map fix