I made it up with him, and now we are friends again.

• 我同他言归于好，我俩现在又成了朋友了。