The dispute between Taylor Swift and tech giant Apple is officially over. The Grammy award-winner announced through Twitter on Thursday that her album “1989” would now be available through Apple Music – Apple’s new music streaming service.

“After the events of this week, I've decided to put 1989 on Apple Music...and happily so,” Swift tweeted.

 

The initial conflict between the two started with a Tumblr post that Swift published Sunday. In the post, Swift stated that she would not allow the album to be streamed through Apple Music, which launches June 30 with a free, three-month trial.

“I’m sure you are aware that Apple Music will be offering a free 3 month trial to anyone who signs up for the service,” Swift wrote. “I’m not sure you know that Apple Music will not be paying writers, producers, or artists for those three months. I find it to be shocking, disappointing, and completely unlike this historically progressive and generous company.”

A testament to the singer’s mass appeal, Apple quickly changed its policy and announced that it would pay artists during the trial period.

Swift asserted on Twitter that this decision was not part of  “some exclusive deal like you've seen Apple do with other artists.”

“This is simply the first time it's felt right in my gut to stream my album,” she added. “Thank you, Apple, for your change of heart.