Gabe, Soon-Yi, Farah, Edgar, and Vic Are Part of a Team

Gabe, Soon-Yi, Farah, Edgar, and Vic are part of a team at Synergetics tasked with putting together a presentation about the company's proposed community outreach initiatives. Farah, the most senior member of the team, has been with the company for several years and has worked on several similar projects. Gabe is new to Synergetics, having been recruited from a competitor. Right away, Farah and Gabe clash. Farah feels that Gabe's ideas are too "out there," while Gabe feels that Farah is boring and unimaginative, content to go with the tried and true ways of doing things that have worked in the past. Over the course of the next week, the other three team members adopt different methods of handling the conflict, but Soon-Yi's approach is the one that has the most success. Based on what you know about conflict management, what did Soon-Yi do to reach the best possible resolution to this conflict?

A) discussed the situation with their boss, who then stepped in to resolve the conflict between Farah and Gabe
B) stated that she would be fine with either Gabe's ideas or Farah's, and that she did not really have an opinion either way
C) proposed several ideas that were slight variations of Gabe's ideas, while demonstrating why her ideas were superior
D) suggested a solution that incorporated the best aspects of Gabe's innovative approach and Farah's practical one
E) tried to smooth over disagreements by changing the subject, then lightened the mood by making a joke