Disney and Charter have ended their carriage dispute