chore(): resolve conflicts

Author: kamilmysliwiec

packages/apollo/package.json

@@ -22,7 +22,7 @@
     "url": "https://github.com/nestjs/graphql/issues"
   },
   "devDependencies": {
-    "@apollo/gateway": "0.44.1",
+    "@apollo/gateway": "0.46.0",
     "@nestjs/common": "8.2.3",
     "@nestjs/core": "8.2.3",
     "@nestjs/platform-express": "8.2.3",
@@ -31,16 +31,16 @@
     "apollo-cache-inmemory": "1.6.6",
     "apollo-client": "2.6.10",
     "apollo-link-ws": "1.0.20",
-    "apollo-server-core": "3.5.0",
-    "apollo-server-express": "3.5.0",
-    "apollo-server-fastify": "3.5.0"
+    "apollo-server-core": "3.6.2",
+    "apollo-server-express": "3.6.2",
+    "apollo-server-fastify": "3.6.2"
   },
   "dependencies": {
     "@graphql-tools/utils": "8.5.5",
     "lodash.omit": "4.5.0"
   },
   "peerDependencies": {
-    "@apollo/gateway": "^0.44.1",
+    "@apollo/gateway": "^0.44.1 || ^0.46.0",
     "@nestjs/common": "^8.2.3",
     "@nestjs/core": "^8.2.3",
     "apollo-server-core": "^3.5.0",

packages/graphql/package.json

@@ -22,7 +22,7 @@
     "@graphql-tools/utils": "8.5.5",
     "@nestjs/mapped-types": "1.0.1",
     "chokidar": "3.5.2",
-    "fast-glob": "3.2.7",
+    "fast-glob": "3.2.11",
     "graphql-tag": "2.12.6",
     "graphql-ws": "5.5.5",
     "iterall": "1.3.0",
@@ -31,7 +31,7 @@
     "subscriptions-transport-ws": "0.11.0",
     "tslib": "2.3.1",
     "uuid": "8.3.2",
-    "ws": "8.3.0"
+    "ws": "8.4.2"
   },
   "devDependencies": {
     "@apollo/subgraph": "0.1.5",