Conversation so far:

Question: Who did he fight?
Self-contained rewrite: Who did Matt Hardy fight?