Optional Merc Spells fix for violation of commit rules.