At long last, it appears the UFC has found common ground on a lightweight bout between former division champion Conor McGregor and top contender Dustin Poirier. The two had been in talks with the promotion for months after initially promoting a sparring exhibition. After plenty of back and forth, the UFC is marking the bout for Jan. 23 at UFC 257, per Damon Martin of MMAFighting:

According to multiple sources speaking to MMA Fighting, both McGregor and Poirier have come to terms on a deal to book the fight for the upcoming UFC 257 card on Jan. 23 with the card expected to take place in Las Vegas.

While the fight has been in the works for several weeks, negotiations were still ongoing to strike a deal with the athletes. Late Monday night, it appears all sides have agreed.

Martin went on to report McGregor still prefers to fight before the end of the year, something the “Notorious” one has been quite vocal about on Twitter. There is a possibility he pushes to be inserted into the main event at UFC 256 after a cancelation on that card:

However, according to sources, McGregor would still prefer returning earlier and it appears he’s pushing for the Dec. 12 date now that Nunes vs Anderson has been scrapped for the main event at UFC 256.

According to ESPN's Ariel Helwani, it is unlikely McGregor-Poirier will take the spot of Nunes-Anderson because it is not a title fight.

In any case, it seems the highly anticipated rematch between Conor McGregor and the “Diamond” will be happening at some point in the near future.

This bout might end up being a No. 1 contender fight for the lightweight title after reigning champion Khabib Nurmagomedov announced his retirement following a win over Justin Gaethje last month.