heroku code
fixed conflict