We may not always be able to come to a resolution in conflict, but we do need to come to a point of reconciliation. (Mike Lee, American pastor)
Reconciliation, as a theological term, refers to making things right with God, and that is a job entrusted to Christians. It is the privilege of godly people, also, to try to bring an end to conflict between people and restore a meaningful relationship between them.
He [God] has committed to us the message of reconciliation. (2 Corinthians 5:19)