conflict res in gemfile