updated uploading to s3 to include meta file
merge