diff --git a/release-notes/1.0/Release-Notes-1.0.0.md b/release-notes/1.0/Release-Notes-1.0.0.md
index d9ce4556..5a46dd86 100644
--- a/release-notes/1.0/Release-Notes-1.0.0.md
+++ b/release-notes/1.0/Release-Notes-1.0.0.md
@@ -81,11 +81,8 @@ New .NET Core APIs
 
 ### CLI
 
-<<<<<<< HEAD
-* Offline support: now you don't have to be connected to the internet to write applications that target only the .NET Core runtime and libraries. This means the core libraries are cached locally after running various dotnet commands the first time. Restoring packages which are not part of the Shared Framework do generally require and do need an internet connection to gather the packages from NuGet.
-=======
-* Offline support: now you don't have to be connected to the internet to write applications that target only the .NET Core runtime and libraries. This means the core libraries are cached locally after running various dotnet commands the first time. Restoring packages which are not part of the Shared Framework do generally require and internet connection to gather the packages from NuGet.
->>>>>>> master
+* Offline support: now you don't have to be connected to the internet to write applications that target only the .NET Core runtime and libraries. This means the core libraries are cached locally after running various dotnet commands the first time. Restoring packages which are not part of the Shared Framework do generally require an internet connection to gather the packages from NuGet.
+
 * New Templates: web, lib and xunittest
 
 ### WCF
@@ -104,4 +101,4 @@ The lists of issues closed for this and past releases can be found here:
 The lists of commits for this release can be viewed here:
 
 * [CLR commits](https://github.com/dotnet/coreclr/commits/release/1.0.0)
-* [BCL commits](https://github.com/dotnet/corefx/commits/release/1.0.0)
\ No newline at end of file
+* [BCL commits](https://github.com/dotnet/corefx/commits/release/1.0.0)