add CONFLICTS