Gemfile.lock conflict resolved