Finished some NPC dialog.
fixed a merge conflict