Resolving Conflict Part 2