fix conflict
Merge pull request #9 from AbbyBiying/map_users

Put map to users