[Fixed] Merge error

Change-Id: I28c99acb8523cb6fdedcf507c2662d0d2a53d2ee
[fixed] Z coordinates for npcs who were inconversable

Change-Id: I97a20eac75f97d22469e8142942f5487fb37ee16
Merge "[Fixed] Merge error" into unstable