merge npc into earlygamedemo