conflict resolved
article
conflict resolved