fixing thin
heroku merge