fixed heroku conflict
fixed heroku conflict