No more OS X instructions? Merge error?