# Conflicts: # app/Service/v3/Implementations/GoodsService.php # app/Service/v3/Implementations/ShopCartService.php # app/Service/v3/Interfaces/ShopCartServiceInterface.php