OS X FileMerge to the rescue

After manual file merge in OS X.