map 10
fixing merge
fixing merge 2