[merge] post merge cleanup + fixed a cpl wrong NPCs spawns