added npc actions
fixed conficts