X Factor judge Cheryl and former judge Louis were embroiled in a war of words in May with Louis branding the former Girls Aloud star as "lazy and irrelevant".
The pair went back and forth with jibes, and even Simon Cowell compared them to famous TV characters Tom and Jerry.
However, it all looks to be water under the bridge now. Cheryl has revealed that she decided to clear the air with Louis following the death of Simon Cowell's mum Julie.
Speaking to The Mirror, Cheryl said: "We'd had a bit of a spat. But with everything that's gone on with Simon [and his mum] I thought, 'It's not worth it.
"I texted Louis, like 'I know you're going to be affected by this' because they've known each other for ever, and I said, 'This is nonsense what's going on between you and I, and I just wanted to say it's forgotten about'. He gave me a really nice message back so I think we've made up now."
While Louis will not be returning to the X Factor, Cheryl remains on the panel alongside Simon and new judges Rita Ora and Nick Grimshaw.
Louis has, however, returned to X Factor for the brand new trailer. The music manager appears as a cleaner in Simon Cowell's lab.
Try Reveal's digital edition on iPhone & iPad. Subscribe now & never miss an issue!
X Factor's most shocking moments: