remove conflict from gemfile