diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 1e4066a..60443ff 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -333,13 +333,9 @@ function menu_block_view_system_menu_block_alter(array &$build, BlockPluginInter
   list(, $menu_name) = explode(':', $block->getPluginId());
   if (isset($menus[$menu_name]) && isset($build['content'])) {
     foreach (element_children($build['content']) as $key) {
-<<<<<<< HEAD
       $build['content']['#contextual_links']['menu'] = array(
-        'route_parameters' => array('menu' => $build['content'][$key]['#original_link']['menu_name']),
+        'route_parameters' => array('menu' => $build['content'][$key]['#original_link']->getMenuName()),
       );
-=======
-      $build['content']['#contextual_links']['menu'] = array('admin/structure/menu/manage', array($build['content'][$key]['#original_link']->getMenuName()));
->>>>>>> patch
     }
   }
 }