We continue our series on resolving everyday conflict by taking a look at peacemaking in the workplace.