Remove ConflictError (which was also removed from bltinmodule.c, even

though the checkin message failed to note that).