Possible bad commit. Failed merge with heroku