Term weighting using stopwords
fixed merge conflicts