Required undergraduate diversity courses often expose students to topics and worldviews which may push them out of their comfort zones and prompt dissonance and even resistance. This paper reports on interviews with 68 faculty members across 16 humanities and social science disciplines at five predominantly white institutions in the Southern United States, detailing how they navigated discussion of controversial topics in required diversity courses. Most instructors aimed to expose students to critical social issues yet were concerned that resistance could disturb the learning process. We identified 20 unique strategies for handling controversial topics in class that included proactively establishing community and safety and normalizing conflict, and reactively acknowledging and surfacing multiple perspectives, as well as connecting content to students' lived experiences. Some instructors also reported a lack of controversy or conflict in their classrooms, which they variously attributed to student characteristics or their own disinclination to promote heated discussion - which, we argue, calls into question the breadth and criteria of many institutionally defined diversity course requirements. We conclude the paper with implications for faculty, educational developers, administrators, and institutions.