# Conflicts: # Assets/Data/UniversalRP/PipelineAsset.asset # Assets/Shaders/Graphs/CliffShader.ShaderGraph # Assets/scenes/Island/GlobalFX Profile.asset # Packages/manifest.json # ProjectSettings/ProjectVersion.txt