Anyone have any good suggestions for managing merge conflicts in an #xcode project file? #swift #ios #development