updating google maps
merge