bullet-conflict-resolution