Writing chapter 2
Conflict solving