Added spell cooldown
Fixed merge conflicts