effective-conflict-resolution2