A long-standing trademark battle surrounding NBCUniversal’s continued use of the DeLorean car in Back to the Future merchandise and tie-ups has been settled in federal court.

NBCUniversal and DeLorean Motor Co. informed the U.S. District Court for the Central District of California that a complete and total resolution had been reached regarding the case, according to a report.