Changes
Conflict resolved
Share changes
Remove and ignore .xcuserstate and .DS_Store files.
Changes