They had a quarrel but have made it up now.

• 他们吵过架，现在和好了。