Fix merge conflict

README.md

@@ -20,6 +20,7 @@ Configure your routes.
 ```php
 <?php
 // config/routes.php
+$router = $di->get('router');
 $router->add('home', '/')
     ->addValues(array('controller' => 'homepage'));
 
@@ -41,6 +42,7 @@ Time to configure your controller according to the route.
 ```php
 <?php
 // config/controllers.php
+$dispatcher = $di->get('dispatcher');
 $dispatcher->setObject('homepage', function ($response) {
     return $response->getBody()->write("<p>Home page in html. Please <a href=\"blog\">Browse</a> and <a href=\"blog/12\">view post</a></p>")->withHeader('Content-Type', 'text/html');
 });

src/Conduit/Middleware/RouterMiddleware.php

@@ -21,8 +21,9 @@ public function __construct(Router $router, Dispatcher $dispatcher)
 
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next = null)
     {
-        $path = $request->getUri()->getPath();
-        $route = $this->router->match($path, $request->getServerParams());
+        $server = $request->getServerParams();
+        $path = parse_url($server['REQUEST_URI'], PHP_URL_PATH);
+        $route = $this->router->match($path, $server);
         if (! $route) {
             return $next($request, $response);
         }

templates/layout.html

@@ -26,7 +26,7 @@
                 <li><a href="/">Home</a></li>
                 <li><a href="/blog">Blog</a></li>
                 <li><a href="/contact">Contact</a></li>
-                <li><a href="/admin/">Admin route</a></li>
+                <li><a href="/admin">Admin route</a></li>
                 <li><a href="/logout">Logout</a></li>
               </ul>
             </div><!-- /.nav-collapse -->