tweets format implemented
git conflict solved