s3 working!
fixed merge conflicts