kNN is over
fix conflicts in gitignore