NPC overlap Town1

Fixed NPC overlap, buildings still hard to decide how to solve…