updated OrderRequest and OrderResponse
fixed merge conflicts