merge with OS X