brand was between Edge and The Undertaker , over the World Heavyweight Championship .
The common feud on the SmackDown brand was between Edge and The Undertaker , with the two battling over the World Heavyweight Championship .