diff --git a/esbuild.config.js b/esbuild.config.js
index 9619975..8132a55 100644
--- a/esbuild.config.js
+++ b/esbuild.config.js
@@ -14,14 +14,7 @@ const commonConfig = {
     external: [
         'bigint-buffer',
         '@triton-one/yellowstone-grpc',
-<<<<<<< HEAD
-        'helius-laserstream',
-        'rpc-websockets',
-        'rpc-websockets/dist/lib/client',
-        'rpc-websockets/dist/lib/client/websocket'
-=======
         'helius-laserstream'
->>>>>>> 1c3d167 (try to fix rpc-websockets)
     ]
 };