Mouse-head-wearing EDM superstar Deadmau5 and cartoon-mouse-copyright-holders Disney have finally ended their legal feud over the trademarking of the shape of Deadmau5’s signature mask, according to the Hollywood Reporter.

“Disney and Deadmau5 have amicably resolved their dispute,” said an attorney for Zimmerman.

The terms of the settlement aren’t immediately clear, but they will likely be detailed in papers to the Trademark Office soon, including a withdrawal of Disney’s opposition and any possible amended trademark registrations. The dispute at the Trademark Office didn’t get far, though the Appeal Board did in April reject one of Deadmau5’s defenses that Disney couldn’t be harmed from the registration.

Deadmau5 (real name: Joel Thomas Zimmerman) performs live in an oversized cartoon mouse head mask, and had trademarked its shape to use in future merchandising properties for such fun things as “electronic equipment, entertainment services, BMX bikes,” and a few other toys someone into EDM and BMX might want to buy.

Watch a video Deadmau5 performing live below, and see if you get him confused with Disney’s greatest asset.