pull request test
Merged files
Interaction with npc fixed