Added two slides to the conflict section of the presentation.