fix heroku conflict