They've managed to patch up their differences.
⇑ Translate the sentence above by Google ⇑
Related: patch
Prev: Emergency surgery patched up his face.
Next: Although most of their scales have been lost, tunas and mackerels retain a patch of coarse scales near the head called the corselet.