fiddling
merge
remove errors
added subtotal to order_items