Athena quest progress halted, possibly due to a server merge?

Hello
I was running an Athena quest today and was subjected to a familiar server merge. This time I was standing at one of my Merchant delivery quest NPC's about to claim the items. After the server merge the NPC no longer had to option to pick up the Items. I attempted to talk to the NPC, I left the Island and came back later, I used task manager to close the game and rejoin the existing session. All of which were for nothing, the only change was after rejoining my "crashed session" the Merchant quest was no longer in my quest wheel. However the Athena quest still would not prgoress. Here is an image showing my Athena on the quest table, and my quest wheel with only "message in a bottle" quests.
link text