By Eric Renner Brown
Updated November 13, 2014 at 12:00 PM EST

The feud has ended. As The New York Times reports, Amazon and Hachette have signed a fresh multi-year contract. Neither company released the agreement’s specifics.

The dispute between the two parties gained notoriety when Amazon removed the pre-order buttons from Hachette titles, delayed shipments of many of the publisher’s books, and came under fire from Authors United and customers. In its defense, Amazon suggested Hachette wanted to fix ebook prices higher than they should be—but Hachette supporters said this ran contrary to Amazon’s desire to take a bigger slice of ebook revenue.

“This is great news for writers,” said Michael Pietsch, Hachette’s chief executive. “The new agreement will benefit Hachette authors for years to come. It gives Hachette enormous marketing capability with one of our most important bookselling partners.”

Although the publisher will get to set the prices of its ebooks—a sticking point during the dispute—an Amazon executive, David Naggar, said the new terms include “specific financial incentives for Hachette to deliver lower prices.” The magnitude of concessions Hachette will make remains unclear.