Walt Disney Co. reconciles with Disney heir