Amazon and Warner Bros. appear to have resolved a pricing dispute that temporarily led the online retailer to halt disc preorders for Warners latest movies. In May, Amazon quietly cut off the option to preorder popular titles like The Lego Movie, an aggressive negotiating tactic that was seen by many as crossing the line. The company has been trying to hammer out more favorable financial terms both with media suppliers like Warner Bros., and also major book publishers. Amazon and Hachette have remained entrenched on opposite sides of their very public war for over a month now, and neither side seems willing to budge.