A chimpanzee that had to undergo surgery to his testicles following a deadly troop fight at Edinburgh Zoo has been reintroduced to the ape enclosure.