Fixed merge conflicts
Images finally load into s3