Fixed merge conflict in mkdocs.yml and fixed typo in contributing/promotion.md

Signed-off-by: Paul Williams <pawilliams@mirantis.com>

docs/extensions/api/README.md

@@ -1,3 +0,0 @@
-# Lens Extension API Reference
-
-TBD

docs/extensions/capabilities/common-capabilities.md

@@ -245,7 +245,7 @@ import { LensRendererExtension } from "@k8slens/extensions";
 import { CustomKindDetails, CustomKindDetailsProps } from "./src/custom-kind-details"
 
 export default class ExampleExtension extends LensRendererExtension {
-  kubeObjectMenuItems = [
+  kubeObjectDetailItems = [
     {
       kind: "CustomKind",
       apiVersions: ["custom.acme.org/v1"],