Macy’s has settled its more than two-year breach-of-contract dispute with Martha Stewart Living Omnimedia, but its lawsuit against JCPenney will continue.

Macy’s claimed that a 2011 merchandising deal between Stewart and JCP for a series of branded in-store shops violated its exclusive agreement with MSLO, dating back to 2006, for licensed items including bedding and bath products.

Details of the settlement between the Macy’s and MSLO are not being released, but both companies mentioned plans for a continued partnership in statements. Macy’s also says that the agreement with MSLO will not impact its ongoing lawsuit against JCP.

In October 2013, JCP revised its agreement with MSLO to remove products in the disputed home goods categories and gave up its 17 percent stake in Stewart’s company following a trial in New York state court, according to Reuters. Macy’s is still seeking damages from JCP.

Macy’s released the following statement: "Macy's has resolved its breach-of-contract lawsuit against Martha Stewart Living Omnimedia. We are pleased to be able to put this matter behind us. The terms of our settlement are confidential, will not be disclosed and are not deemed to be material to Macy's. We can now return our focus to what we do best–bringing beautifully designed, high-quality, affordable products to consumers nationwide. We look forward to a continued, successful partnership together. This settlement does not affect Macy's outstanding claim against JCPenney, which remains subject to the court's decision."