These days, it can be hard to keep track of who Amazon is fighting and on which front. But it’s possible that one of its more significant disputes has reached détente.

The e-commerce behemoth may be close to ending its fight with Disney, according to the Wall Street Journal. For the past two months, Amazon has not allowed pre-orders of Disney DVDs on its site.

Considering that Disney makes virtually every film on the planet now (Pixar, Lucas, and Marvell movies in addition to its own), freezing out the Mouse was no small move by Amazon.

But according to the Journal, upcoming Disney releases such as “Guardians of the Galaxy” and “Maleficent” are available again for pre-order.

What is unclear, according to the Journal’s sources, is whether that’s merely an indication of sufficient progress in talks or whether a final deal is imminent. The disagreement apparently centered around issues such as the price of the DVDs, how they are promoted by Amazon, and which company is responsible for any losses when Amazon matches a lower price from competitors.

Earlier this year, Amazon and Time Warner had a similar fight. And, of course, Amazon and Hachette Book Group are still at odds over e-book prices.

VentureBeat's mission is to be a digital town square for technical decision-makers to gain knowledge about transformative enterprise technology and transact. Learn more about membership.