Fixed zombies
fixed merge