Walt Disney Studios Home Entertainment and Luxo AS have reached an agreement that keeps both parties out of court over a trademark infringement dispute involving UP, BLU-RAY.COM reports.

At issue is the limited edition UP: Luxo Jr. Collectible Desk Lamp Set Disney is released on Nov. 10 that features a working replica of the Luxo lamp from UP. Luxo AS sued Disney for trademark infringement, potentially delaying the release of the collectible.

The base of the lamp, which will be released on schedule thanks to the agreement, is designed to hold your Pixar Blu-ray collection.