resolved Gemfile & Gemfile.lock conflicts
resolved Gemfile & Gemfile.lock conflicts
resolved Gemfile & Gemfile.lock conflicts