Added Explosive & Fireball
Fixed merge conflict