New: conflict-management