Upstream has released updates that appears to apply and compile correctly
Paper Changes:
0dcce21f Merge remote-tracking branch 'origin/ver/1.16'
6ff90880 Merge branch 'ver/1.16'
81f6d51f [Auto] Updated Upstream (CraftBukkit)
2248fffc Clean up duplicated GameProfile Properties
49491f32 Fix Player Profile textures being duplicated - Fixes#3667
3fc98999 [1.15] Fix MobGoals#getAllGoals not actually returning all goals (#3671)
1d1c0561 Manually inline PooledBlockPosition#d(int, int, int)
5fc45f4d Revert recent changes around player skulls using user cache
a8ffecc7 Fix NPE and uuid lookup for player skulls