fixes heroku merge conflicts
fixes more merge conflicts