add websocket
merge