conflict resolved
resolved another conflict