By that time Undertaker *could* be back. So that feud may take place. Unles it's saved for Mania.
But imo, it is far too early to even speculate about what to do with Edge upon his return, as WWE could be a completely different place by that time (injuries, roster changes, suspensions, deaths, etc.).