changes to tfidf
fixed merge