fixed conflicts and added stephens spore and also have mitosis testable