Holly m021980 19718479943560 create order item functionality

Fix merge conflicts