map
map resolved conflict