The error is suggesting that the branch pushed and what HEAD is on Heroku has diverged. Try pushing to Heroku locally from your computer and you should see the same message. Do whatever merge, rebase, or force push that you need to do and then you should be good.