diff --git a/core/lib/Drupal/Core/Entity/DisplayComponentHandlerPluginManager.php b/core/lib/Drupal/Core/Entity/DisplayComponentHandlerPluginManager.php
index 60d41b5..35bad18 100644
--- a/core/lib/Drupal/Core/Entity/DisplayComponentHandlerPluginManager.php
+++ b/core/lib/Drupal/Core/Entity/DisplayComponentHandlerPluginManager.php
@@ -52,7 +52,7 @@ public function getInstance(array $options) {
     $plugin_id = $options['type'];
 
     if (!isset($this->plugins[$plugin_id]) && !array_key_exists($plugin_id, $this->plugins)) {
-      $this->plugins[$plugin_id] = $this->discovery->getDefinition($plugin_id) ? $this->createInstance($plugin_id) : NULL;
+      $this->plugins[$plugin_id] = $this->getDiscovery()->getDefinition($plugin_id) ? $this->createInstance($plugin_id) : NULL;
     }
 
     return $this->plugins[$plugin_id];
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index 38524c3..f1a03df 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -2035,6 +2035,5 @@ function hook_display_component_handler_info_alter(array &$plugins) {
 }
 
 /**
-<<<<<<< 7e01fa5342c5588d7987ee7e065f941ab24bb695:core/lib/Drupal/Core/Entity/entity.api.php
  * @} End of "addtogroup hooks".
  */