fixed conflict in gemfile