Added super zombie
Fixed conflicts
Fixed conflicts 2