conflict settlement

X