Conflict resolution
Conflict resolution is the methods and processes involved in facilitating the peaceful ending of social conflict.