diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
index fc75eb6..d4b7715 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
@@ -134,10 +134,7 @@ public function preSaveRevision(EntityStorageControllerInterface $storage_contro
   }
 
   /**
-   * Overrides Entity::id().
-=======
    * {@inheritdoc}
->>>>>>> applied patch
    */
   public function id() {
     return $this->get('mlid')->value;