added table with shipping info
pulling
fixed merge conflicts