move music to s3
fix merge conflict
fix merge conflict