Working through conflict - Part 1