fixing lon/lat flip
merge