simple map
fixed merge conflicts