From Conflict Resolution To Reconciliation