testing git and heroku merge