Conflicts: composer.json composer.lock packages/Webkul/Product/src/Listeners/ProductFlat.php packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php