Modifs class tweet
Resolving conflict