Fixed merge issue (google maps)