Taylor Swift has announced that she has acquired her catalog for her six first albums in a deal with Shamrock Capital, re-uniting the superstar with her work six years after the original sale to Scooter Braun’s Ithaca Holdings sparked one of the most infamous disputes in the modern music business.

Taylor Swift is now the proud owner of her entire catalog of music, roughly six years after she protested the sale of her master recordings by her former record label.

Swift lost control of the masters when Braun snapped them up from the pop diva’s former label. She made her dissatisfaction with the deal known publicly; Braun sold the recordings to Shamrock for roughly $300 million, but Swift complained Braun would still benefit from her work.