diff --git a/release-notes/3.0/preview/3.0.0-preview4.md b/release-notes/3.0/preview/3.0.0-preview4.md
index ec7f7079..5c94848b 100644
--- a/release-notes/3.0/preview/3.0.0-preview4.md
+++ b/release-notes/3.0/preview/3.0.0-preview4.md
@@ -47,7 +47,7 @@ The following repos have been updated
 
 ## Notable Changes in 3.0.0 Preview 4
 
-* ASP.NET Core 3.0 Preview 4 ([bugs](https://github.com/aspnet/AspNetCore/issues?q=is%3Aissue+label%3A%223+-+Done%22+label%3Abug+milestone%3A3.0.0-preview4), [features](https://github.com/aspnet/AspNetCore/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%223+-+Done%22+label%3Aenhancement+milestone%3A3.0.0-preview4+))
+* ASP.NET Core 3.0 Preview 4 ([bugs](https://github.com/aspnet/AspNetCore/issues?q=is%3Aissue+label%3A%223+-+Done%22+label%3Abug+milestone%3A3.0.0-preview4), [features](https://github.com/aspnet/AspNetCore/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%223+-+Done%22+label%3Aenhancement+milestone%3A3.0.0-preview4))
 * WinForms Chart control now available for .NET Core
 * Improving .NET Core Version APIs
 * Tiered Compilation (TC) Update
@@ -117,4 +117,8 @@ A few changes have been made which could result in subtle changes of behavior in
 
 [dotnet-blog]: https://devblogs.microsoft.com/dotnet/announcing-net-core-3-preview-4/
 [aspnet-blog]: https://devblogs.microsoft.com/aspnet/asp-net-core-updates-in-net-core-3-0-preview-4/
-[ef-blog]: https://devblogs.microsoft.com/dotnet/announcing-entity-framework-core-3-0-preview-4
\ No newline at end of file
+<<<<<<< HEAD
+[ef-blog]: https://devblogs.microsoft.com/dotnet/announcing-entity-framework-core-3-0-preview-4
+=======
+[ef-blog]: https://devblogs.microsoft.com/dotnet/announcing-entity-framework-core-3-0-preview-4
+>>>>>>> 4d49ca8c4d9efd3ef61c8966bd36898fa73760df