Make up

To resolve a quarrel, to forgive someone after an argument.

The couple had a big fight at the restaurant but they made up and things quickly got back to normal.