renamed to CONFLICT