Apple and Samsung Electronics have settled years-long patent dispute related to the copying of iPhone design, according to a filing the U.S. District Court for the Northern District of California.

The settlement ends a patent battle that the US-based Apple has waged against Korea-based Samsung since 2011 over allegations that Samsung violated Apple’s patents by copying the design of the iPhone smartphone.

In May, a U.S. jury awarded Apple $539 million, Reuters reported. Samsung had paid Apple $399 million to compensate for patent infringement. Samsung will need to make another payment of nearly $140 million to Apple if the verdict was upheld.