They patched up their tiff.

• 他们平息了争执。