Update LocationManager.js

The merge version