reconciled

adjective

1. made compatible or consistent

Similar word(s): consistent

verb

1. simple past tense and past participle of reconcile