prepare for mac merge