They patched up their differences.

• 他们解决了彼此间的分歧。