Update tables for Submitting an order
Fix merge conflicts