changed twitter texts
solved conflicts