new orders have their associated items
orders have items associated with that order
solved merge conflicts