hacer las paces

Etymology
lit. 'make the peaces'.

Verb

 * 1)  to make peace, to make amends, to make up