Merge XCode project files in git