mac upate
merge