added NPC
resolving conflict
remove log.txt