# Conflicts: # app/Console/Kernel.php # app/Http/Controllers/Business/Pages.php # config/database.php # modules/EcommerceFinance/Console/SyncJushuitanShipping.php # modules/EcommerceFinance/Repositories/ShippingOrderRepository.php # resources/views/business/pages/courier-payables/shipping-data.blade.php # routes/admin.php