resolving merge conflicts in Gemfile.lock