GoogleMapEngine tested
merge conflict