Making the twitter spitter work again
fixing merge conflict