something wrong with previous commit, recommit again
forget to save change, recommit again
commit master branch to reset heroku
merge conflict