fixed merge conflicts in gemfile
fix typos in map.js
fix merge conflict in gemfile