It's not clear why the NPC files are in the pull diff ?
I already have those, I wrote them.

Did you actually change something ?