conflict in gemfile solved