This document discusses managing conflict in cross-functional and virtual teams. It defines cross-functional teams as groups with complementary skills working toward a common goal, and virtual teams as geographically dispersed groups that use technology to accomplish tasks. Managing conflict is important for team performance. Sources of conflict include differences in space, time, culture and organization between virtual team members. Providing a shared understanding, structured coaching and feedback can help virtual teams succeed. Temporal coordination mechanisms can weaken the negative effects of avoidance behavior on team performance.