fixed <<<HEAD rubbish in routes.php