refactor TweetClusterer
conflict resolve