Yes. Data will appear in the game later if you fought tankheadboobabot(not in the game yet). If you fight Data first the tankheadboobabot will ambush you during the tech train event.
Thanks for letting me know, I also wanted to ask when fixing aida does anything change if we select roxanne to be indifferent, friend, or love?