missings export osx files, merging problem?