Amazon and Hachette Resolve Dispute