Univision, Televisa Settle Dispute