Repairing heroku merge