Roxanne Pallett and Ryan Thomas appear to have made up on Celebrity Big Brother 2018.
It follows a controversial 'altercation' between the pair in Thursday's highlights show. Ryan was given a formal warning by Big Brother for 'unwanted physical contact' after Roxanne complained that he had been 'violent' towards her.
She claimed in the Diary Room: "I'm just a little bit in shock. I went from being upset to angry now. He actually punched me like a boxer would punch a bag. It wasn't banter, it wasn't a joke."
However the vast majority of viewers felt Roxanne overreacted to Ryan's play fighting, with many even calling for her to be removed from the house.
A spokesperson for Ofcom has said it has received 11,215 complaints about Roxanne's actions in the episode to date. They added: "We are assessing these complaints against our broadcasting rules, before deciding whether or not to investigate."
In a preview clip from Saturday night's show which aired tonight (Friday), the pair were seen coming face to face.
Ryan says of his actions: "I promise you've got it wrong. Let's put it to bed."
Roxanne replies: "I just felt shocked and it threw me. I'm not questioning your integrity."
Ryan adds: "Let's just sort it out, make everyone else smile and we can move forward."
The pair then shook hands.
The full scenes in will air in Saturday night's episode at 10PM on Channel 5.
In tonight's show, Roxanne continued to complain about Ryan's "assault".
She told Big Brother in the Diary Room that Ryan's warning was "not good enough", as she explained: "I don't feel very comfortable or happy at the moment because I slept separately last night because I felt uncomfortable because Ryan assaulted me and is still here."
Later, Roxanne gave her account of the incident to Ben Jardine.
Roxanne accused: "Ryan punched me, it wasn't play fighting. He punched me repeatedly in my ribs there.
"And I didn't say anything but I was in so much pain, it was intentional to hurt. He went for it, he did it with his fists It was so aggressive."