Fix XCode Project after recent merge