Fix Merchant#invoice_items, add most_items to merchant_repository
Fix merge conflicts