Resolve conflict by keeping upstream content

README.md

@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-# template-repository
-=======
 # The Go Programming Language
 
 Go is an open source programming language that makes it easy to build simple,
@@ -43,4 +40,3 @@ places to ask questions about the Go language.
 
 [rf]: https://reneefrench.blogspot.com/
 [cc4-by]: https://creativecommons.org/licenses/by/4.0/
->>>>>>> upstream/master