first commit after heroku merge