# Conflicts: # src/ImageSharp/Memory/Allocators/IManagedByteBuffer.cs # src/ImageSharp/Memory/Allocators/Internals/BasicByteBuffer.cs # src/ImageSharp/Memory/Allocators/Internals/ManagedBufferBase.cs # tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs # tests/ImageSharp.Tests/Formats/Tiff/Compression/PackBitsTiffCompressionTests.cs # tests/ImageSharp.Tests/Image/ImageFrameTests.cs # tests/ImageSharp.Tests/Image/ImageTests.cs # tests/ImageSharp.Tests/Memory/Allocators/ArrayPoolMemoryAllocatorTests.cs # tests/ImageSharp.Tests/Memory/Allocators/SimpleGcMemoryAllocatorTests.cs # tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs # tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs