Rita Ora and Calvin Harris have made up after disagreeing over comments Ora apparently made about Cheryl's 'Call My Name' track.

Ora had been quoted in the media as saying that she had been offered 'Call My Name', which was written by Harris, first.

Harris took to Twitter to deny the claim, with Ora later tweeting herself that her words had been twisted by the media.

However, Ora tweeted today (June 18) that she hates "beef and fighting" and offered to clear things up with Harris. She said:

"I hate beef and fighting… So I love u all @calvinharris call me ill explain way actually happened they twisted it and congratulations. X."

To which Harris replied: "Me too, thank you luv + good luck with everything!"