Merge conflicts in Gemfile.lock