Fixed some merge issues

Mario has a problem with his animation controller. Never jumps and die
animation not there

Need to be able to kill enemies after shrink so maybe not item layer?
Not sure