fixed infowindows
merge conflict