Update Zombie.h

conflict fix