Add stopwords
Also remote extra if conflict