Collective bargaining dispute in the MLB ended