Resolved merge conflict

src/Service/AbstractNavigationFactory.php

@@ -42,7 +42,7 @@ protected function getPages(ServiceLocatorInterface $serviceLocator)
             }
 
             $application = $serviceLocator->get('Application');
-            $urlHelper   = $serviceLocator->get('ViewHelperBroker')->load('url');
+            $urlHelper   = $serviceLocator->get('ViewHelperManager')->get('url');
             $routeMatch  = $application->getMvcEvent()->getRouteMatch();
             $pages       = $this->getPagesFromConfig($configuration['navigation'][$this->getName()]);
 
@@ -92,4 +92,4 @@ protected function injectComponents($pages, RouteMatch $routeMatch, UrlHelper $u
         }
         return $pages;
     }
-}
+}