addMarker + addPolyline static fix2
addMarker + addPolyline static update
addMarker + addPolyline static update2
merge conflict