寝てました!! 
bda8345e9 (upstream/main) Bump rails from 6.1.5.1 to 6.1.6 (#18372)
2923ca461 Bump @rails/ujs from 6.1.5 to 6.1.6 (#18380)
a52dc01f3 Bump nokogiri from 1.13.4 to 1.13.6 (#18371)
3261d89af Bump aws-sdk-s3 from 1.113.2 to 1.114.0 (#18373)
マージ失敗しましたまじでか
You have changed in the Gemfile:
* rails-settings-cached from `rubygems repository https://rubygems.org/` to `https://github.com/zunda/rails-settings-cached.git (at v0.6.6-aliases-true@dc5640f)`
Bundler Output: You are trying to install in deployment mode after changing your Gemfile. Run `bundle install` elsewhere and add the updated Gemfile.lock to version control.
forceの力を信じなさい
$ vi Gemfile.lock
$ git add Gemfile.lock
$ git commit --amend
[use-ruby31 cc49360cf] Merge branch 'master' into use-ruby31
Date: Thu May 12 09:17:54 2022 -1000
pre-commit hookで落ちたからforce要らないのわね