Amazon and Disney are close to resolving their dispute over video terms, and Amazon has re-activated the preorder buy buttons on Disney titles, according to the Wall Street Journal.  The truce is also freeing up Marvel titles; Amazon is offering Guardians of the Galaxy Blu-ray preorders at an aggressive 37% discount.

The dispute began almost two months ago (see "Amazon Takes on Disney"), and was reportedly over pricing, promotion, placement on the website, and which company takes the hit when Amazon price-matches competitors (see "Walmart Goes After Amazon on Marvel, Disney Titles"). 

The dispute between Amazon and Disney was relatively mild on this year’s scale of Amazon supplier disputes.  Amazon did not slow shipping on Disney titles or promote alternate titles from other suppliers against Disney titles, both tactics it has used in its acrimonious dispute with Hachette (see "Amazon Digging in for Long War with Hachette").  Amazon had an even shorter dispute with Warner Home Video, which also affected VIZ, which was quickly settled  (see "Amazon Supplier Wars Update").