After twenty years of bitter feuding, Prince has settled his contract dispute with Warner Bros. Records.

As Rolling Stone reports, Prince originally signed a deal with the record company in 1992, but the relationship grew strained when Warner Bros. was not releasing Prince’s music at the rate that he wanted. The feud grew so strong that in 1993 Prince changed his name to an unpronounceable symbol and drew “slave” across his forehead during concerts.

The new agreement between the two parties allows Prince control ownership over all of the original recordings of all the music he made under Warner Brothers, while the record label now has the chance to release previously unheard material.

“Everyone at Warner Bros. Records is delighted to be working with Prince once again: he is one of the world’s biggest stars and truly a unique talent,” said Cameron Strang, Warner Bros. Chairman and CEO, in a statement.

Under the new agreement, Warner Bros. also intends to release a digitally remasterd version of Prince’s iconic 1984 soundtrack album Purple Rain, celebrating its 30th anniversary this year, according to Variety. Prince also hinted that some new music is also in the works.

“A brand-new studio album is on the way and both Warner Bros. Records and Eye are quite pleased with the results of the negotiations and look forward to a fruitful working relationship,” said Prince in a statement.

Prince has lately been performing with 3rdEyeGirl, an all female backing band. Their new album, Plectrum Electrum, will be released sometime later this year.