New: conflictmanagement