changed tweet name
resolved conflict