fixed heroku conflict