t12
conflict resolve