Merged Hero_Charms and Hero_Magic