fixed conflict in Gemfile