Diplo has reached a "resolution in principle" in his legal battle with a former lover who he accused of stalking him and who accused him of sexual assault.
