Upstream has released updates that appears to apply and compile correctly
Paper Changes:
df0d7b0d Update upstream CB
6ea3c2cf [CI-SKIP] Rebuild patches
d7bed4cb Heavily optimise random block ticking (#2914)
b66d9ff8 Update upstream CB
ba71c5d6 Stop stripping private use block Unicode from signs
28d9dcfc Entity Jump API (#1587)
9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion
054e20da Clean up imports on ThrownEggHatchEvent
a8984ccb Add ThrownEggHatchEvent (#1982)
9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
4a97a7ca Add option to disable pillager patrols (#2626)
23e53aab Backport MC-160177 fix from 1.15 (#2702)
45089d59 Update upstream CB
761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)