u8815: fix megaderp during merge