Title: Resolving Conflict in Teams Package