Activity: Understanding and Resolving Conflicts