reconciling
re-con-cil-ing
verb
Bringing conflicting people, ideas, or accounts into agreement or harmony.
"She is reconciling the budget figures."
noun
The act or process of restoring friendly relations or making things compatible.
"The reconciling of their past took time."
Thesaurus
Synonyms: adaptive, accommodative, adaptative