more merging from mac