mend the conflict Synonym