Your browser does not support the video element. Diplo achieves a resolution in lengthy legal dispute