diff --git a/release-notes/releases.json b/release-notes/releases.json
index 55cad43c..05f9a1d9 100644
--- a/release-notes/releases.json
+++ b/release-notes/releases.json
@@ -1,7 +1,5 @@
 [
     {
-<<<<<<< HEAD
-=======
         "version-runtime": "2.1.1",
         "version-sdk": "2.1.301",
         "version-runtime-display": "2.1.1",
@@ -163,30 +161,21 @@
         "lts-sdk": "FALSE"
     },
     {
->>>>>>> b6442508bd96d57adb989bb028059239295bf52f
         "version-runtime": "2.1.0-rc1",
         "version-sdk": "2.1.300-rc1-008673",
         "version-runtime-display": "2.1.0-rc1",
         "version-sdk-display": "2.1.300-rc1",
-<<<<<<< HEAD
-        "date": "05/07/18",
-=======
         "date": "2018-05-07",
->>>>>>> b6442508bd96d57adb989bb028059239295bf52f
         "dlc-runtime": "https://download.microsoft.com/download/D/0/B/D0B7F62D-9C5D-4CF3-AB6C-88F56B4FC1A9/",
         "dlc-sdk": "https://download.microsoft.com/download/B/1/9/B19A2F87-F00F-420C-B4B9-A0BA4403F754/",
         "blob-runtime": "https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.1.0-rc1/",
         "blob-sdk": "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/2.1.300-rc1-008673/",
-<<<<<<< HEAD
-        "runtime-linux-x64": "dotnet-runtime-2.1.0-rc1-linux-x64.tar.gz",
-=======
         "release-notes":"https://github.com/dotnet/core/blob/master/release-notes/2.1/Preview/2.1.0-rc1.md",
         "runtime-linux-x64": "dotnet-runtime-2.1.0-rc1-linux-x64.tar.gz",
         "runtime-linux-arm-x32":"dotnet-runtime-2.1.0-rc1-linux-arm.tar.gz",
         "runtime-linux-musl-x64":"dotnet-runtime-2.1.0-rc1-linux-musl-x64.tar.gz",
         "runtime-linux-arm-x64":"dotnet-runtime-2.1.0-rc1-linux-arm64.tar.gz",
         "runtime-rhel.6-x64":"dotnet-runtime-2.1.0-rc1-rhel.6-x64.tar.gz",
->>>>>>> b6442508bd96d57adb989bb028059239295bf52f
         "runtime-mac-x64": "dotnet-runtime-2.1.0-rc1-osx-x64.tar.gz",
         "runtime-mac-x64.pkg": "dotnet-runtime-2.1.0-rc1-osx-x64.pkg",
         "runtime-win-x86": "dotnet-runtime-2.1.0-rc1-win-x86.zip",
@@ -202,13 +191,10 @@
         "sdk-win-x86.exe": "dotnet-sdk-2.1.300-rc1-008673-win-x86.exe",
         "sdk-win-x64.exe": "dotnet-sdk-2.1.300-rc1-008673-win-x64.exe",
         "sdk-win-x64.exe-gs": "dotnet-sdk-2.1.300-rc1-008673-win-gs-x64.exe",
-<<<<<<< HEAD
-=======
         "sdk-linux-arm-x32":"dotnet-sdk-2.1.300-rc1-008673-linux-arm.tar.gz",
         "sdk-linux-arm-x64":"dotnet-sdk-2.1.300-rc1-008673-linux-arm64.tar.gz",
         "sdk-linux-musl-x64":"dotnet-sdk-2.1.300-rc1-008673-linux-musl-x64.tar.gz",
         "sdk-rhel.6-x64":"dotnet-sdk-2.1.300-rc1-008673-rhel.6-x64.tar.gz",
->>>>>>> b6442508bd96d57adb989bb028059239295bf52f
         "hosting-win-x64.exe": "dotnet-hosting-2.1.0-rc1-final-win.exe",
         "rps-win-x64.exe": "aspnetcore-runtime-2.1.0-rc1-final-win-x64.exe",
         "rps-win-x86.exe": "aspnetcore-runtime-2.1.0-rc1-final-win-x86.exe",
@@ -216,15 +202,10 @@
         "rps-win-x86": "aspnetcore-runtime-2.1.0-rc1-final-win-x86.zip",
         "rps-mac-x64": "aspnetcore-runtime-2.1.0-rc1-final-osx-x64.tar.gz",
         "rps-linux-x64": "aspnetcore-runtime-2.1.0-rc1-final-linux-x64.tar.gz",
-<<<<<<< HEAD
-        "checksums-runtime": "https://dotnetcli.blob.core.windows.net/dotnet/checksums/2.1-RC1-Runtime-SHA.txt",
-        "checksums-sdk": "https://dotnetcli.blob.core.windows.net/dotnet/checksums/2.1-RC1-SDK-SHA.txt",
-=======
         "asp-runtime-linux-arm-x64":"aspnetcore-runtime-2.1.0-rc1-final-linux-arm.tar.gz",
         "asp-runtime-linux-musl-x64": "aspnetcore-runtime-2.1.0-rc1-final-linux-musl-x64.tar.gz",
         "checksums-runtime": "https://dotnetcli.blob.core.windows.net/dotnet/checksums/2.1-rc1-runtime-sha.txt",
         "checksums-sdk": "https://dotnetcli.blob.core.windows.net/dotnet/checksums/2.1-rc1-sdk-sha.txt",
->>>>>>> b6442508bd96d57adb989bb028059239295bf52f
         "security": "FALSE",
         "lts-runtime": "FALSE",
         "lts-sdk": "FALSE"