reconciled

adjective
  1. having restored friendly relations after a disagreement or conflict
  2. having accepted or come to terms with something unpleasant
  3. having made consistent or compatible
  4. Usage: often used with financial accounts or conflicting ideas

Examples