fix a few conflicts (collections & _sentiment)