20170312 entertainment.english.music.news: Rita Ora and Calvin Harris end their feud