They patched up their difference.

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