# Conflicts: # Packages/manifest.json # Packages/packages-lock.json # ProjectSettings/ProjectSettings.asset # ProjectSettings/ProjectVersion.txt # UserSettings/EditorUserSettings.asset