merge websocket fix