Update

Author: guardrex

aspnetcore/performance/caching/memory.md

@@ -166,18 +166,9 @@ Using a `CancellationTokenSource` allows multiple cache entries to be evicted as
 
 ## Additional resources
 
-<<<<<<< HEAD
-* [Work with a distributed cache](xref:performance/caching/distributed)
-* [Detect changes with change tokens](xref:fundamentals/change-tokens)
-* [Response caching](xref:performance/caching/response)
-* [Response Caching Middleware](xref:performance/caching/middleware)
-* [Cache Tag Helper](xref:mvc/views/tag-helpers/builtin-th/cache-tag-helper)
-* [Distributed Cache Tag Helper](xref:mvc/views/tag-helpers/builtin-th/distributed-cache-tag-helper)
-=======
 * <xref:performance/caching/distributed>
 * <xref:fundamentals/primitives/change-tokens>
 * <xref:performance/caching/response>
 * <xref:performance/caching/middleware>
 * <xref:mvc/views/tag-helpers/builtin-th/cache-tag-helper>
 * <xref:mvc/views/tag-helpers/builtin-th/distributed-cache-tag-helper>
->>>>>>> Update Distributed cache topic+sample