Working with conflict - Part 2