Added chatbox
Merge