[#69988532] resolved Gemfile.lock conflict