Fixed mage merge