Conversation so far:
Who did Dwayne Johnson have a feud with?
John Cena
Did Dwayne Johnson wrestle Austin and Ken?
The Rock feuded with Austin and Ken Shamrock through the end of 1997 and beginning of 1998.
Did Dwayne Johnson wrestle during this time?
On January 19, 1998, at Royal Rumble, The Rock defeated Shamrock by disqualification to retain the Intercontinental title.

Question: what wrestling appearance did he make in 2004?
Self-contained rewrite: What wrestling appearance did Dwayne Johnson make in 2004?