# Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs # ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta # Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta