After nearly a year of wrangling and public dueling, the two behemoths have struck a deal that allows both to continue using the iconic emblem they’ve shared for more than a century. The agreement comes after a federal judge last month booted most of the lawsuit filed by J&J, which claimed the Red Cross broke the law by licensing the ubiquitous symbol to other companies.

Originally, J&J insisted the Red Cross stop using the emblem on health-care products sold to the public. Part of the suit was dismissed in November, but Johnson & Johnson continued to argue that the Red Cross violated federal law by licensing the symbol to other companies.

“Johnson & Johnson brought the lawsuit very reluctantly only to protect what we believed were important trademark issues,” J&J ceo Bill Weldon says in a statement. “The decision of the court has brought clarity to those issues, including its ruling that Johnson & Johnson has properly used its valued Red Cross trademark over the years, and we have no desire to continue our dispute through trial and appeal.”