Hopefully, both. Even if fusion works extremely well, fission should find niches. Fission power is likely to remain more power dense than fusion for a while, so in situations where one cares about weight and size it is better than fusion.