effective-conflict-resolution