textvectorizer
merge conflict solved