Title: Understanding and Resolving Conflict