comment out gems for debugging heroku deploy
comment out gems for debugging heroku deploy
comment out gems for debugging heroku deploy
comment redis back in for deploy
comment redis back in for deploy
resolve merge conflict and run bundler