resolved Gemfile.lock conflicts