The drama between Taylor Swift and actor Michael J. Fox is o-v-e-r. After Fox seemingly dissed Swift by saying he would not approve of his son dating the country queen after a joke made at the Golden Globes, the singer tweeted letting her fans and followers know everything has been smoothed over.

Here's a refresher course in case you missed the brief "battle." At Sunday's (Jan. 13) Golden Globes ceremony, host Tina Fey joked that Swift should date Fox's son Sam, who was Mr. Golden Globe. That job involves handing out the statues.

Fox, who was an A-list actor in the 1980s, starring in 'Family Ties' and the 'Back to the Future' franchise before limiting his acting career due to Parkinson's Disease, commented on the joke after the fact and insulted Swift, saying, "I don’t keep up with it all. But Taylor Swift writes songs about everybody she goes out with, right. What a way to build a career."

Ouch! While it's all hypothetical and we can understand the actor not wanting his son to eventually be the subject of a song, that was a wee bit harsh, no?

His statements seemed like a slap in the face of America's Sweetheart, and it upset some of her fans. However, Swift took to Twitter to let everyone know that the she and Fox communicated after he reached out, and that all is now good between them.

Whew!

She tweeted:

Swift and Fox fans can heave a collective sigh of relief as they have buried the hatchet after the briefest beef.