Bridging Divides: Understanding and Resolving Conflict for a Collab...