*.pbxproj -crlf merge=ours *.xcworkspacedata -crlf merge=ours *.xcscheme -crlf merge=ours