Mostly painless Xcode project merges.