Resolving Conflict Part 1