add ability for user to see delivery address when viewing past orders
fix merge conflicts