KDTree fix
conflict fix