From 969ee52c29426547ce606cc7524d074990efe3ba Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 31 May 2023 18:08:29 +0100
Subject: [PATCH] Fixing merge conflict.

---
 packages/server/src/websockets/builder.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/websockets/builder.ts b/packages/server/src/websockets/builder.ts
index 6a0a401925..ff7c50ebf4 100644
--- a/packages/server/src/websockets/builder.ts
+++ b/packages/server/src/websockets/builder.ts
@@ -14,9 +14,9 @@ export default class BuilderSocket extends BaseSocket {
     super(app, server, "/socket/builder", [authorized(permissions.BUILDER)])
   }
 
-  async onConnect(socket: ?Socket) {
+  async onConnect(socket?: Socket) {
     // Initial identification of selected app
-    socket.on(BuilderSocketEvent.SelectApp, async (appId, callback) => {
+    socket?.on(BuilderSocketEvent.SelectApp, async (appId, callback) => {
       await this.joinRoom(socket, appId)
 
       // Reply with all users in current room