Wait, what? Is Calvin Harris's feud with ex Taylor Swift officially over?

Updated: 

For a while now, it has been fair to say that there is no love lost between exes Calvin Harris and Taylor Swift.

But now it seems the DJ has decided to put their old feud to bed as he has posted a very complimentary tweet about the singer, and it certainly seems to be a bit of an olive branch.

To recap: the former couple, who split earlier this year after a 15-month romance, butted heads after Taylor revealed she was the co-writer behind his mega-hit This Is What You Came For with Rihanna.

Calvin Harris and Taylor Swift
Calvin Harris and Taylor Swift in 2015 (Chris Pizzello/AP/PA Images)

The Bad Blood singer's spokesman confirmed in July: "Taylor Swift wrote This Is What You Came For under the pseudonym Nils Sjoberg."

The Scottish DJ hit out at Taylor on Twitter, posting a long tirade that confirmed that, yes, she did have a hand in the song and also sung on it too.

He went on to add it was "hurtful" for her team to "go so far out of their way to try and make ME look bad".

Then, referencing her now defunct fling with actor Tom Hiddleston, he jibed: "I figure if you're happy in your new relationship you should focus on that instead of trying to tear your ex bf down for something to do."

He added: "I know you're off tour and you need someone new to try and bury like Katy ETC but I'm not that guy, sorry. I won't allow it."

But now, Calvin has written a post on Twitter that praises Taylor, meaning the rift is perhaps finally over.

A Twitter account named Rihanna Facts shared a nugget of information that stated This Is What You Came For is the only song released in 2016 to be certified 2 x platinum in the UK.

He retweeted it and wrote: "I am blessed to work with incredible artists @rihanna @taylorswift13 thank you!!!"

Taylor has yet to respond, but fans are now wondering if this means a reconciliation is on the cards.