The bitter legal dispute between Warner Music Group and Madonna's Maverick Records has ended with Warner agreeing to buy Madge out of her 12-year-old label. The deal apparently does not affect the diva's current contract with Warner Bros.