Diplo achieves a resolution in lengthy legal dispute