Here's an outline for conflict resolution, which helped me grok the process. Click on the image at left for the PDF.