Trying to solve heroku conflict