Reconciled

word:en:reconciled

Make (one thing) compatible with (another).