YTTV and Disney has resolved dispute