They had a quarrel, but they're friends again now.
⇑ Translate the sentence above by Google ⇑
Related: quarrel