Overview
"Conflict Resolution" is the twenty-first and penultimate episode of the second season of the American comedy television series The Office the show's twenty-seventh episode overall. Written by executive producer and show runner Greg Daniels and directed by Charles McDougall, "Conflict Resolution" first aired in the United States on May 4, 2006, on NBC. The episode guest stars Scott Adsit, from Moral Orel and 30 Rock, as a photographer.
The series depicts the everyday lives of office employees in the Scranton, Pennsylvania branch of the fictional Dunder Mifflin Paper Company. In the episode, Michael Scott (Steve Carell) resolves a conflict between Oscar Martinez (Oscar Nunez) and Angela Martin (Angela Kinsey), and then discovers a file of other unresolved complaints between staff members and he determines to resolve them. But Michael's attempts actually unearth old tensions and create new ones between the office employees. Meanwhile, an unkind comment from Dwight Schrute (Rainn Wilson) about being transferred causes Jim Halpert (John Krasinski) to seriously rethink his work situation.
"Conflict Resolution" features the return of a poster created for the earlier episode "Christmas Party". The ending of the installment bears a striking similarity to the ending of the 1981 action film Raiders of the Lost Ark. Receiving largely positive reviews, the episode received a 3.7 Nielsen rating and was watched by 7.4 million viewers.
Plot
When Michael Scott (Steve Carell) hears Oscar Martinez (Oscar Nunez) complaining about Angela Martin's (Angela Kinsey) baby poster to Toby Flenderson (Paul Lieberstein), he intervenes and resolves the conflict by forcing Oscar to wear the poster like a t-shirt. Inspired, Michael wrestles the file outlining other unresolved office complaints from Toby, determined to resolve them all. Michael publicly reads all the outstanding complaints, even though they were supposed to be anonymous, which only serves to further increase office tensions. Pam Beesly (Jenna Fischer) is angered by a redacted complaint that she plans her wedding during office hours. She concludes that the complaint was filed by Angela, which particularly angers her as she is covering for Angela's secret relationship with Dwight Schrute (Rainn Wilson).
From Wikipedia (CC BY-SA 4.0).