Conflicts: - `yarn.lock`: Upstream updated a dependency adjacent to one that is only in glitch-soc. Updated as upstream did.
Rails/RootPathnameMethods