merge with mac