Fix merge silliness in contents.xcworkspacedata