A truce (if it’s temporary) A ceasefire, if it’s temporary and about fighting/war Peace!

There are many phrases for this."We made up" or "We buried the hatchet." These are two of the most common ways to say it, but there are many ways.