diff --cc core/includes/menu.inc
index 57681a3,f88681e..0000000
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@@ -5,8 -5,6 +5,11 @@@
   * API for the Drupal menu system.
   */
  
++<<<<<<< HEAD
 +use Symfony\Component\HttpFoundation\Request;
 +
++=======
++>>>>>>> patch from 35
  use Drupal\Component\Utility\NestedArray;
  use Drupal\Core\Cache\CacheBackendInterface;
  use Drupal\Core\Template\Attribute;
@@@ -1398,8 -1483,12 +1471,17 @@@ function _menu_build_tree($menu_name, a
  
      // Build an ordered array of links using the query result object.
      $links = array();
++<<<<<<< HEAD
 +    if ($result = $query->execute()) {
 +      $links = menu_link_load_multiple($result);
++=======
+     $min_depth = 0;
+     foreach ($query->execute() as $item) {
+       $links[] = $item;
+       if (!$min_depth || ($item['depth'] < $min_depth)) {
+         $min_depth = $item['depth'];
+       }
++>>>>>>> patch from 35
      }
      $active_trail = (isset($parameters['active_trail']) ? $parameters['active_trail'] : array());
      $data['tree'] = menu_tree_data($links, $active_trail, $min_depth);