Fix userMac rebase.