#1 - fix heroku conflict