added channel subscription to socket.io
resolved conflictsA