Made some basic changes to map.js
Fixed merge conflict