conflict-analysis-and-resolution.pdf