Core/Spells: Fix a merge error