gemfile change
gemfile update
gemfile conflict fix