They shook hands and made up.

• 他们握手言和。