conflicts recode
