merge with mac version