Merge with magento