Clean up heroku merge mistakes