merge with code deployed at heroku