Add AWS support for image upload
Fix merge conflict