Added conflict matrices and updateConflicts