MLB players and owners just settled their pissing match