Which fish did modern tetrapods descend from?
Your question cannot be answered.
One of the effects of how incomplete the fossil record is, is that it is impossible to say if a species was a member of a direct line or a side branch. we just do not have the resolution in the vast majority of the fossil record to tell. The answer could be both, neither or one or the other and we would not be able to tell. All we can say is it is likely they were closely related to or part of our ancestral line. But the working assumption is always that you have a related sister species and not the ancestor unless you can show extremely good evidence otherwise, (which is so rare you can assume it is impossible in extinct vertebrates).
Tiktaalik and Ichthyostega only give us a rough idea of what our ancestors would have been like. It is impossible to say with any certainty if either was a direct ancestor or merely a sister species to them. This is part of the reason cladograms are constructed the way they are, so that no fossil is ever put on the direct line.
Source.
Source 2
Note: Tiktaalik probably did not live on land, more likely it was a shallow water air breather.
Also whatever species was the ancestor of tetrapods, all living tetrapods would be its descendants. One aspect of population genetics is for a specific individual in an ancestral population, past a certain point in a linage  either every descendant is your descendant or you have no descendants.