being reconciled with

• being content with; reaching a compromise; becoming friends again