# Conflicts: # Dockerfile # app/Company.php # app/Http/Controllers/CompanyController.php # app/Http/Kernel.php # app/User.php # composer.json # composer.lock # config/app.php # package-lock.json # routes/api.php # tests/TestCase.php