Correct Heroku conflict with S3