HBK and Diesel did battle at 'In Your House: Good Friends, Better Enemies'