Merge s3-related files