chore: resolve conflicts

plugins/api-docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-api-docs",
-  "version": "0.1.1-alpha.23",
+  "version": "0.1.1-alpha.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,10 +20,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.23",
-    "@backstage/core": "^0.1.1-alpha.23",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.23",
-    "@backstage/theme": "^0.1.1-alpha.23",
+    "@backstage/catalog-model": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.24",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
+    "@backstage/theme": "^0.1.1-alpha.24",
     "@kyma-project/asyncapi-react": "^0.13.1",
     "@material-icons/font": "^1.0.2",
     "@material-ui/core": "^4.11.0",
@@ -39,9 +39,9 @@
     "swagger-ui-react": "^3.31.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.23",
-    "@backstage/dev-utils": "^0.1.1-alpha.23",
-    "@backstage/test-utils": "^0.1.1-alpha.23",
+    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/test-utils": "^0.1.1-alpha.24",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",