fix: Merge conflicts

package.json

@@ -46,7 +46,11 @@
     "ts-jest": "^26.5.6",
     "turbo": "^1.3.1",
     "typedoc": "^0.22.15",
+    "typedoc-frontmatter-plugin": "link:docs-util/typedoc-plugins/typedoc-frontmatter-plugin",
+    "typedoc-monorepo-link-types": "^0.0.2",
     "typedoc-plugin-markdown": "^3.12.1",
+    "typedoc-plugin-merge-modules": "^3.1.0",
+    "typedoc-plugin-reference-excluder": "^1.0.0",
     "typeorm": "^0.2.31"
   },
   "lint-staged": {
@@ -68,6 +72,7 @@
     "test:integration:plugins": "jest --config=integration-tests/jest.config.js --projects=integration-tests/plugins",
     "test:fixtures": "jest --config=docs-util/jest.config.js --runInBand",
     "generate:services": "typedoc --options typedoc.services.js",
+    "generate:js-client": "typedoc --options typedoc.js-client.js",
     "release:snapshot": "changeset publish --no-git-tags --snapshot --tag snapshot"
   },
   "dependencies": {