#Merge Conflicts

Automatically merging conflicts in Xcode project files