They have patched up their quarrel and are good friends again.

• 他们平息了口角，又成了好朋友。