I had a violent argument with Patrick, but he had made his peace with me by the end of the afternoon.

• 我和帕特里克大吵了一场，但黄昏前他就和我和好了。