S3
Merge branches.
Add fail case for deploying