Bury the Hatchet(make peace)
Somebody told me that you and Doug had been quarreling over the construction site of the new building.
That's true, but we worked out the problem and decided to bury the hatchet.
Glad to hear that. You guys always worked well together.
Well, once we came to the conclusion that we both had the same goal in mind, we put an end to our bitter feelings and made peace with each other.
conclusion = 結論 conclude = 結論づける