Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc32ef338e86cc74719815b12b67128f
- `app/javascript/packs/public.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc32ef338e86cc74719815b12b67128f