table-ified line item
merged conflicts
merged conflicts again