merge works nowgit push heroku master