Celebrity Cease-fires

How a TV star reunited with his former nemesis following epic falling out, more stars who made up