Fixed broken socket.io due to merge conflict