k_neighbors merge fix
stuff
blah