Wilmar and QSL end long-running dispute