merge 

Fix NPC move & talk