laravel
resolve conflict

Conflicts:
	app/routes.php