rectifying the conflict Synonym