fixes map commit part 1
map conflict fix commit part 2