Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.
RSpec/IndexedLet
Auth::OmniauthCallbacks
RSpec/VerifiedDoubles
CLI::Cache
lib/linter