Animating Zombie
Resolving merge conflicts