It's the end of an ongoing dispute