C
conflict-resolution