With the holiday shopping season around the corner, Hachette Book Group and Amazon.com have finally resolved their bitter dispute over the control of book pricing.

The Internet retailer and publishing giant have been battling it out since Hachette’s contract with Amazon expired in March. The multiyear agreement announced jointly by the companies Thursday enables Hachette to set consumer prices.