Make up (with someone)

To become friends again after a quarrel.

The girl made up with her friend after they had a fight last week.