abating the conflict Synonym