conciliation

the act of placating and overcoming distrust and animosity

any of various forms of mediation whereby disputes may be settled short of arbitration

the state of manifesting goodwill and cooperation after being reconciled

“there was a brief period of conciliation but the fighting soon resumed”