reconciled

adj

1.
made compatible or consistent