Fixed the bug in Chat

Chat bug fixed
Fixing conflicts, chat bug fixed

Conflicts resolved and the chat bug fixed