The two friends quarreled, but they made it up.

• 这两个朋友拌过嘴，但他们已经和解了。