revert to upstream copy
map still broken, no collision
fix merge conflict
add background
Merge remote-tracking branch 'upstream/master'