Merge the Local and Heroku S3 manifest versions.