Conflicts are components of life in an organization that are inevitable and sometimes beneficial if controlled in organizations that are effective. People have different needs and interests, both in their private spheres of life and in their business lives. It should be emphasized that conflicts within the organization are inevitable precisely because of the emergence of different interests, so the intensity and number of conflicts is often quite high, if it is not possible to successfully prevent and prevent. Today's managers and leaders of organizations will find it difficult to succeed in their work if they do not have the skills to successfully resolve conflicts. An organization, by its definition, implies an association of people who are conscious and who aim to fulfill certain tasks with the least effort in any area and sphere of human social life. In order for an organization to achieve its goals, it must have certain appropriate resources, such as material resources and people, as key to achieving the set goals. Organizational goals of the organization should be able to be achieved with the least possible effort, because this is another role of the organization, to find a solution and the way that is best from the point of view of effectiveness and efficiency of the organization. Conflict management is essential so that business in an organization can be healthy. In this diploma work, the concept of leadership and conflict management in the organization was explored, all with the aim of understanding how leadership within the organization itself resolves new conflict situations.