Merging Xcode project files Merging Xcode project files git git