added group chat
added group chat
fixed merge