Yup, it means my fix is not good.

To work around it:
u16 conflict = (offset == 0x1f) ? 0xff : 0;

But I think the real issue is that the CPU is doing a bus error trap. It's not a weird bus conflict after all.