After months of contention, a settlement has been reached between a music company owned by Sony and the late Marvin Gaye’s family.

In case your memory is blurry on this one, Marvin’s family sued the company, EMI, over the hit song “Blurred Lines.” And no, this has nothing to do with Robin’s eyebrow-raising performance with Miley Cyrus and her trusty foam finger.

The Gayes accused EMI of not pursuing a copyright infringement case against Robin for, as the family argues, the blatant similarities between Robin’s Grammy-nominated single and Marvin’s classic “Got to Give It Up.”

Yesterday (January 14) some of the legal drama came to an end when a Los Angeles judge granted a dismissal of the lawsuit filed by Nona Marvisa Gaye and Frankie Christian Gaye (Marvin’s daughter and son by Janis Hunter). The dismissal came after the Gayes and Sony had reached a settlement, the terms of which have not been disclosed as of publishing.

Despite the settlement, legal difficulties are still brewing between the family and Robin. The Gayes insist the 36-year-old performer and his collaborators Pharrell Williams and T.I. copied Marvin’s music and that Robin may have overstepped his creative bounds on other songs. More on that as details emerge.

Sources: HitFix Music, Billboard

Elisabeth Kramer is an Assistant Editor at Wetpaint Entertainment and our resident Downton Abbey expert. Follow her on Twitter and Google+!