raccommoder

Etymology
From.

Verb

 * 1) to fix, fix up (small things)
 * 2) to mend, patch up
 * 3) to reconcile