diff --git a/release-notes/8.0/8.0.5/8.0.5.md b/release-notes/8.0/8.0.5/8.0.5.md
index dcd0c4a9ae..d42a552f5c 100644
--- a/release-notes/8.0/8.0.5/8.0.5.md
+++ b/release-notes/8.0/8.0.5/8.0.5.md
@@ -64,11 +64,7 @@ You need [Visual Studio 17.9](https://visualstudio.microsoft.com) or later to us
 
 ## Feedback
 
-<<<<<<< HEAD
-Your feedback is important and appreciated. We've created an issue at [dotnet/core #xxxx](https://github.com/dotnet/core/issues/xxxx) for your questions and comments.
-=======
 Your feedback is important and appreciated. We've created an issue at [dotnet/core #9309](https://github.com/dotnet/core/issues/9309) for your questions and comments.
->>>>>>> 9164a32eb86ab42a3c080b2350b25ea7cafe92f7
 
 [blob-runtime]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/
 [blob-sdk]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/