Created Chapter 2.2 Conflict Resolution