resolve merge conflicts

Author: YulNaumenko

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.15.3
+ARG NODE_VERSION=14.15.4
 
 FROM node:${NODE_VERSION} AS base
 

dev_docs/api_welcome.mdx

@@ -0,0 +1,14 @@
+---
+id: kibDevDocsApiWelcome
+slug: /kibana-dev-docs/api-welcome
+title: Welcome
+summary: The home of automatically generated plugin API documentation using extracted TSDocs
+date: 2021-01-02
+tags: ['kibana','dev', 'contributor', 'api docs']
+---
+
+Welcome to Kibana's plugin API documentation. As a plugin developer, this is where you can 
+learn the details of every service you can take advantage of to help you build awe-inspiring creative solutions and applications!
+
+If you have any questions or issues, please reach out to the Kibana platform team or create an issue [here](https://github.com/elastic/kibana/issues).
+

dev_docs/dev_welcome.mdx

@@ -0,0 +1,17 @@
+---
+id: kibDevDocsWelcome
+slug: /kibana-dev-docs/welcome
+title: Welcome
+summary: Build custom solutions and applications on top of Kibana.
+date: 2021-01-02
+tags: ['kibana','dev', 'contributor']
+---
+
+Welcome to Kibana's plugin developer documentation!
+
+Did you know that the vast majority of functionality built inside of Kibana is a plugin? A handful of core services hold the system together,
+but it's our vast system of plugin developers that provide the amazing, out of the box, functionality you can use when building your own set of
+custom utilities and applications.
+
+Browse the `Services` section to view all the plugins that offer functionality you can take advantage of, or check out the
+`API documentation` to dig into the nitty gritty details of every public plugin API.

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -15,6 +15,7 @@ readonly links: {
             readonly urlDrilldownTemplateSyntax: string;
             readonly urlDrilldownVariables: string;
         };
+        readonly discover: Record<string, string>;
         readonly filebeat: {
             readonly base: string;
             readonly installation: string;

docs/development/core/public/kibana-plugin-core-public.md

@@ -114,7 +114,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsFindResponsePublic](./kibana-plugin-core-public.savedobjectsfindresponsepublic.md) | Return type of the Saved Objects <code>find()</code> method.<!-- -->\*Note\*: this type is different between the Public and Server Saved Objects clients. |
 |  [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md) | Represents a failure to import due to a conflict, which can be resolved in different ways with an overwrite. |
 |  [SavedObjectsImportConflictError](./kibana-plugin-core-public.savedobjectsimportconflicterror.md) | Represents a failure to import due to a conflict. |
-|  [SavedObjectsImportError](./kibana-plugin-core-public.savedobjectsimporterror.md) | Represents a failure to import. |
+|  [SavedObjectsImportFailure](./kibana-plugin-core-public.savedobjectsimportfailure.md) | Represents a failure to import. |
 |  [SavedObjectsImportMissingReferencesError](./kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.md) | Represents a failure to import due to missing references. |
 |  [SavedObjectsImportResponse](./kibana-plugin-core-public.savedobjectsimportresponse.md) | The response describing the result of an import. |
 |  [SavedObjectsImportRetry](./kibana-plugin-core-public.savedobjectsimportretry.md) | Describes a retry operation for importing a saved object. |

docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.id.md

@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObjectsImportError](./kibana-plugin-core-public.savedobjectsimporterror.md) &gt; [error](./kibana-plugin-core-public.savedobjectsimporterror.error.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObjectsImportFailure](./kibana-plugin-core-public.savedobjectsimportfailure.md) &gt; [error](./kibana-plugin-core-public.savedobjectsimportfailure.error.md)
 
-## SavedObjectsImportError.error property
+## SavedObjectsImportFailure.error property
 
 <b>Signature:</b>
 

docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObjectsImportFailure](./kibana-plugin-core-public.savedobjectsimportfailure.md) &gt; [id](./kibana-plugin-core-public.savedobjectsimportfailure.id.md)
+
+## SavedObjectsImportFailure.id property
+
+<b>Signature:</b>
+
+```typescript
+id: string;
+```