reconciliation

(n) a restoration of friendship or harmony   
The two warring countries got over their differences and moved towards reconciliation