New merge resolution for Gemfile.lock