testing map
fixed merge conflict