​Major League Baseball and the MLBPA have reached an agreement. Finally. 

According to ESPN's Jeff Passan, both parties have reached a deal on a new mid-collective bargaining agreement, which they are set to announce on Thursday.

Included in the deal is a ​single trade deadline and an All-Star Election Day for the upcoming season. One of the main arguing points in a potential new CBA was roster expansion to 26 players. Well, that is coming just in time for the 2020 campaign. 

​​Tensions have flared the past couple of months, as the Players' Association was unhappy with the treatment of its free agents, with Manny Machado and Bryce Harper signing late, while Dallas Keuchel and Craig Kimbrel​ still sit on the open market.

This is a step in the right direction for MLB, as the CBA is not set to expire until December 2021. 

The new agreement will allow both sides to begin finding resolutions to labor issues, such as a prospect spending the start of the season in the minors due to the league's service time manipulation rule.

The league and the Player's Association just took a huge step toward avoiding a potential lockout.