getting ready to deploy
gemfile conflict