Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@abf6b6c2 Allow replace effects in Consumable Component Builder (#12938)
PaperMC/Paper@3d1425f0 Fix phantoms failing to target players near non-insomniacs (#12953)
PaperMC/Paper@4fe66e58 Fix lead_break sound playing after cancelling EntityUnleashEvent (#12944)