started on chat room
fixed merge