quelling the conflict Synonym