working on knn.py
merge conflict