Correctional Services said that “matters are under control” at Johannesburg’s Sun City Prison on Wed.
Rap mogul Sean Diddy Combs, pictured, has re-hired a choreographer who accused him of threatening her with a chair before firing her.
Laurie Ann Gibson appeared in the first season of Diddy's Making the Band reality show, during which she and the rapper had a major disagreement and she was dismissed.
She filed a complaint against Combs, alleging he lifted a chair and threatened her with it.
But now all seems to be good between the pair.
Gibson will work with the rapper again on the new season of the show.
She told Eonline.com: "We had this relationship before MTV, so there was a place of, 'Can we put this behind us? I believe in who you are. Do you still believe in who I am? We have something bigger than the show'.
"Businesswise it was definitely in my best interest to take the challenge to move forward and put it behind me."
The pair's reunion will feature during the season premiere of the new Making The Band when it airs on MTV in the US next week Tuesday.
Gibson said: "I said, 'No chairs and no entourage!' There were no chairs, except the ones we were sitting on, and there was no entourage." - Wenn