Fixing broken merge (conflicts in Route.php not resolved)