They've managed to patch up their differences.
⇑ Translate the sentence above by Google ⇑
Related: patch
