Conflicts: - `db/schema.rb`: Upstream re-generated the file, which reordered all the definitions. Re-generated the files as well.
Conflicts: - `db/schema.rb`: Upstream re-generated the file, which reordered all the definitions. Re-generated the files as well.