final github/heroku merger