merge mac version