conciliation

The process of bringing peace and harmony; the ending of strife.

A form of alternative dispute resolution, similar to but less formal than mediation, in which the parties bring their dispute to a neutral third party, who helps lower tensions, improve communications and explore possible solutions.