heroku push fix
routes fix
heroku_merge