fixed tweetsortsentiment
fixed merge conflict