Fix merge conflicts

evennia/server/portal/webclient.py

@@ -117,6 +117,10 @@ class WebSocketClient(WebSocketServerProtocol, _BASE_SESSION_CLASS):
                     self.sessid = old_session.sessid
                     self.sessionhandler.disconnect(old_session)
 
+        self.protocol_flags["CLIENTNAME"] = "Evennia Webclient (websocket)"
+        self.protocol_flags["UTF-8"] = True
+        self.protocol_flags["OOB"] = True
+
         # watch for dead links
         self.transport.setTcpKeepAlive(1)
         # actually do the connection