gemfile change
conflict solved