The introductory section is designed to help teachers understand the theoretical and developmental principles upon which the curriculum is based. The 20 conflict skill lessons introduce students to 10 basic conflict resolution concepts. The skill lessons also introduce various conflict activity types, which combine conflict resolution skills with new ways of thinking about conflict. The thematic unit on discovery and conflict assists students to understand diversity and to deal with conflict that is rooted in diversity. The final section explores how teachers can reinforce the skills and concepts leaned here by integrating them into the standard middle school content. The field test version of the curriculum focuses on English/language arts and social studies. The curriculum allows the material to be taught either in workshops or through a standard lesson approach, and it includes role plays and case studies, journals, mini-lectures, microlabs, and group work.