git push heroku master cannot merge with master branch due to unrelated histories

Question

I\'ve got an app in heroky named my-app that I\'m trying to update using git push heroku master but whenever I do that, I get this error