Amazon.com and Hachette Book Group settled their six-month dispute over terms for ebook and print sales, while Amazon also appears to have reached peace with Disney over a less-public disagreement over DVD sales.

The e-commerce company, in a fight that commenced in May, was delaying shipments of Hachette titles by up to four weeks, had reduced discounts on some books and was not accepting pre-orders. On Thursday, the companies jointly announced that they had reached a new, multiyear agreement for ebook and print sales in the U.S. that will take effect in early 2015.

Amazon and Hachette said they will immediately resume normal sales with the publisher’s titles “prominently featured in promotions.” Hachette’s notable authors include J.K. Rowling, Stephen Colbert and Malcolm Gladwell.

“This is great news for writers,” Michael Pietsch, Hachette Book Group CEO, said in a statement. “It gives Hachette enormous marketing capability with one of our most important bookselling partners.”

Amazon’s Kindle VP David Naggar added, “We are pleased with this new agreement as it includes specific financial incentives for Hachette to deliver lower prices, which we believe will be a great win for readers and authors alike.”

In a separate contract spat, Amazon this summer stopped taking pre-orders for Disney DVDs, including “Maleficent” and “Captain America: The Winter Solider.”

Disney and Amazon were reported to be near a settlement last month, and now the dispute appears to be finally over: Future releases of Mouse House DVDs, including “Big Hero 6” (release date not set) and a special Blu-ray-DVD-digital release of “101 Dalmatians: Diamond Edition” set for Feb. 10, 2015, release, are now available to pre-order via Amazon. Reps for Amazon and Disney did not respond to requests for comment.

Amazon had a similar standoff with Warner Bros. over DVD sales earlier this year, with the e-commerce company ceasing pre-orders of upcoming titles, before that was settled.