swap out amazon image hosting  accounts
fix merge conflicts