random initial tweet added
conflict resolved