assuaging the conflict Synonym