Apple and Amazon have agreed to end their trademark dispute over the right to use the term “app store.” U.S. District Judge Phyllis Hamilton on Tuesday ordered that the entire case be dismissed at the request of both companies. Reuters reported that the dismissal came after Apple and Amazon agreed not to sue or file counterclaims against each other. Apple filed the original complaint last year against Amazon, claiming the company’s “Amazon Appstore” infringed upon its trademark. Amazon argued that the term “app store” is generic and Apple’s claims were baseless. The case was partially dismissed earlier this year when a judge ruled that Apple could not bring a false advertising claim against Amazon.