Merged local changes with WebSockets modifications to client.