Changes to Export and Fixes for Nicole
Shipping address
Second address fix
Sync
Price conflict