Mac version works
Merge files