setup for heroku conflict with github somehow