言归于好

to make it up with somebody, to become reconciled...