merge xcode