update on get nearby point
merge conflict