a100fc32d5
Ensures recipes/core/grub and the WIP conflict redirect are created by apply-patches.sh, so a fresh sync-upstream + apply-patches cycle preserves the GRUB integration.