6-ConflictResolution.pdf