merging
fixed path typo map.html