Order can be set to completed, and new order is started with current user_id
a few conflicts resolved!!!!!!