Diplo achieves a resolution in long legal dispute