# Conflicts: # app/Http/Controllers/Api/v1/ApiController.php # app/Http/Controllers/Api/v1/TestController.php