conflict-analysis-and-resolution-t1213.pdf