reconciled

verb

Simple past tense and past participle of reconcile.

adjective

made compatible or consistent