merge from mac