twitter_user and twitter_search_results
resolve merge conflicts
rebuild