collect the tweets
merge and resolve conflicts
merge and resolve conflicts