# Conflicts: # cocos/renderer/pipeline/BatchedBuffer.cpp # cocos/renderer/pipeline/BatchedBuffer.h # cocos/renderer/pipeline/InstancedBuffer.cpp # cocos/renderer/pipeline/InstancedBuffer.h # cocos/renderer/pipeline/PipelineStateManager.cpp # cocos/renderer/pipeline/PipelineStateManager.h # cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp # cocos/renderer/pipeline/RenderAdditiveLightQueue.h # cocos/renderer/pipeline/RenderInstancedQueue.cpp # cocos/renderer/pipeline/RenderQueue.cpp # cocos/renderer/pipeline/forward/ForwardStage.cpp # cocos/renderer/pipeline/helper/SharedMemory.h # cocos/renderer/pipeline/ui/UIFlow.cpp # cocos/renderer/pipeline/ui/UIFlow.h # cocos/renderer/pipeline/ui/UIStage.cpp # cocos/renderer/pipeline/ui/UIStage.h # cocos/scripting/dop/BufferPool.h