Resolve previously committed merge conflicts
Remove incorrect invoice_item.items relationship
Clean up InvoiceItem
More progress on ItemRepository#revenue