#conflict resolved #argument settled #dispute handled #disagreement ended #peace restored #served and done