diff --git a/esbuild.config.js b/esbuild.config.js
index 7f3c751..9619975 100644
--- a/esbuild.config.js
+++ b/esbuild.config.js
@@ -14,10 +14,14 @@ 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)
     ]
 };
 
diff --git a/package.json b/package.json
index a6b141e..440a8af 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
 		"ts-node": "^10.9.1"
 	},
 	"resolutions": {
-		"rpc-websockets": "10.0.0",
 		"@solana/web3.js": "1.98.0"
 	},
 	"scripts": {