merged with mac