Fix corruption of Xcode project caused by last merge.