The reconciliation comes after years of public disagreements and family differences that had often made headlines