mage changes
cause conflict