new path to twitter-api
resolving conflicts