fixed conflict in Gemfile lock