xī​shì​níng​rén

to patch up a quarrel