The Office: Conflict Resolution

"Conflict Resolution" is the twenty-first episode of season two of the American legal drama series The Office. It was directed by Paul Stanley and written by Ernest Kinoy. It first aired on CBS on Saturday, May 4th, 2006 at 8:30 pm.