Update google_map.js
Merg conflict