Import tidyup for magic.model and magic.model.action
Merge
Reorganise Imports for MagicAbility