Quick Plug and Van der Knaap Group end dispute