merge develop for heroku