[CF-Devel] Re-added the Spell of Conflict

[Peter Mardahl]

I put the Spell of Conflict into the CVS again.
Last time I didn't have much luck, but this time
it seems I got it right.

However, I thought that last time too, so if you
notice anything weird like the last time I tried
it, lemme know.

PM