This article acknowledges Chris Merchant’s contribution to the development of the concept of a conflict management system (CMS). It discusses the relationship between a CMS and a closely related concept, an integrated conflict management system (ICMS), which is a more comprehensive or integrated approach to conflict management. The article reports on surveys of Fortune 1000 corporations that show that the implementation of a CMS in these corporations rose from 17 percent in 1997 to about 30 percent in 2011. Chris Merchant expressed optimism about the future of conflict management systems. Although her vision of the future of conflict management systems has not yet been fulfilled, one can hope that if these systems provide not only organizational efficiency but also workplace justice, her optimism will one day be justified.