diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
index 3f84f99..052eb1f 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
@@ -181,8 +181,6 @@ class FieldInstance extends ConfigEntityBase implements \ArrayAccess, \Serializa
   public $deleted;
 
   /**
-<<<<<<< HEAD
-=======
    * The field ConfigEntity object corresponding to $field_uuid.
    *
    * @var \Drupal\field\Plugin\Core\Entity\Field
@@ -190,14 +188,6 @@ class FieldInstance extends ConfigEntityBase implements \ArrayAccess, \Serializa
   protected $field;
 
   /**
-   * The widget plugin used for this instance.
-   *
-   * @var \Drupal\field\Plugin\Type\Widget\WidgetInterface
-   */
-  protected $widgetPlugin;
-
-  /**
->>>>>>> 8.x
    * Flag indicating whether the bundle name can be renamed or not.
    *
    * @var bool
@@ -392,7 +382,7 @@ public function delete($field_cleanup = TRUE) {
 
       // Remove the instance from the entity form displays.
       if ($form_display = entity_load('entity_form_display', $this->entity_type . '.' . $this->bundle . '.default')) {
-        $form_display->removeComponent($this->field_name)->save();
+        $form_display->removeComponent($this->field->id)->save();
       }
 
       // Delete the field itself if we just deleted its last instance.