Updated the Chat Stuff
Solve merge conflict