gemfile conflict changed