resolved conflicts

frontend/app/player/web/assist/AssistManager.ts

@@ -185,7 +185,7 @@ export default class AssistManager {
       const socket: Socket = (this.socket = io(urlObject.origin, {
         withCredentials: true,
         multiplex: true,
-        transports: ['pooling', 'websocket'],
+        transports: ['polling', 'websocket'],
         path: '/ws-assist/socket',
         auth: {
           token: agentToken,

tracker/tracker-assist/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openreplay/tracker-assist",
   "description": "Tracker plugin for screen assistance through the WebRTC",
-  "version": "11.0.2",
+  "version": "11.0.2-beta.1",
   "keywords": [
     "WebRTC",
     "assistance",

tracker/tracker-assist/src/Assist.ts

@@ -241,7 +241,7 @@ export default class Assist {
       extraHeaders: {
         sessionId,
       },
-      transports: ['pooling', 'websocket'],
+      transports: ['polling', 'websocket',],
       withCredentials: true,
       reconnection: true,
       reconnectionAttempts: 30,