Conflict is a component of interpersonal interactions, and therefore natural in the workplace. While neither inevitable nor intrinsically bad, conflict is commonplace. Conflicts may arise in different forms, exist between and among different levels of the organizational hierarchy, and involve supervisors, peers, or subordinates, as well as customers, clients, suppliers, and other stakeholders. The central idea of conflict management is that organizations can improve in the way conflict is managed by accepting conflict as part of organizational dynamics and by learning to deal with it effectively and efficiently. Given the ubiquity of conflict, it is perhaps unsurprising that the study of its management and resolution has become a popular topic in the last decades, particularly in the fields of management, human resources, and psychology. The aim of this article is to cover current topics in the area of conflict management in the workplace. To do so, the article is divided into different sections. In the different sections of the article, the reader will find academic sources on conflict and conflict behavior, types of conflict in the workplace at different levels, such as interpersonal, team, and intergroup, and a variety of resolution strategies, particularly negotiation and mediation, covering interventions by supervisors, colleagues, and (internal and external) third parties. Further, studies on the link between diversity, culture, and conflict, mistreatment in the workplace, and conflict in specific contexts, such as family business or start-ups, are presented. This article concludes with a collection of works on conflict management systems and tools to measure and evaluate conflict behavior in organizations. The sections included were chosen given the relevance from an academic point of view as well as from a practitioner perspective, where these aspects all are inevitable parts of the understanding of organizational conflict at different levels of complexity, and from understanding these conflicts and the conflict behavior to third parties. Complexity also adds in specific types, as harassment and bullying, often related to diversity and inclusion in organizations, and in specific contexts, as start-ups or family businesses, both rapidly growing fields of academic interest and of high importance to the global economy. Conflict management should also be understood as a system, as the alignment of different possible actors and interventions is essential for effective prevention and intervention. The article ends giving a closer look at validated instruments of use in research and practice to assess conflict behaviors. Regarding the methodology, a systematic approach was followed to select the works appearing in this bibliography. The following keywords were included in the search: “conflict resolution,” “conflict management,” “workplace conflict,” “conflict resolution,” “relationship conflict,” “leader conflict,” “conflict process,” “interpersonal conflict,” “conflict dynamic,” “negotiation,” and “mediation.” Articles were gathered from the academic databases Scopus and Web of Science, and their titles and abstracts were reviewed against the authors’ selection criteria.