add groupchat
merge from nick at local