Farrah and James haven't seen eye-to-eye since entering the compound last week, but it seems like they've finally found common ground.
With past arguments focusing on Farrah accusing James of 'looking at her' and James accusing Farrah of insinuating there is something more than friendship between him and Austin Armacost, will the pair finally be civil towards each other?
In scenes to air on Thursday (3 September), James and Farrah have a chat in the garden after Fatman Scoop asks the Teen Mom star to come out for a chat.
Speaking to Farrah, James tells her: "I don't want to fight with you ever."
The conversation soon moves on, as Farrah - who admitted she still grieves for childhood sweetheart Derek Underwood - reveals that her type is "tall, dark and handsome".
In another scene in the bedroom, Jenna Jameson questions Farrah about James: "You like that little thang?"
Farrah responds: "I'd probably break his d**k."
Later, James comes to the Diary Room to talk about Farrah and asks: "Do you think she fancies me?"
And we suppose it's only right to ask, does James fancy Farrah too?!
Catch CBB tonight on Thursday 3 September at 9pm on Channel 5.
Try Reveal's digital edition on iPhone & iPad. Subscribe now & never miss an issue!