[yán guī yú hǎo]
make it up with sb.; become reconciled; be on good terms again; be reconciled (after a quarrel); be reconciled with; kiss and be friends; make up a quarrel; make up with a person with whom one has quarrelled; resume friendship; sink a feud; smoke the calumet [the pipe of peace]