fix merge in map.js?
Seriously, I think i really fixed it now