I took it that Gamora didn't come back. That was her in the past and came along with Nebula into the future. When Starlord saw her and went to her and touched her and she punched him then she asked Nebula "that's him?" I took that as in her mind she haven't met him yet and Nebula was gave her a heads up.