OT Disney and DirecTV resolve dispute