Since this other merge issue also dealt with the same individual, we suspect that now that the merge bug is fixed, this should also have fixed the error when trying to manually update the ID. Can you let me know if you still see the error when updating ID on the encounter?