merg code with heroku