Spoiler here so don't look if you haven't done the story.
Its still Nanamo after the death, everything that happens during quests is before 2.1. So you will have a paradox. Someone on the forums had a screenshot post 2.55 with Nanamo still being the person you give the food.
EDIT: Found the post http://forum.square-enix.com/ffxiv/t...=1#post2875532