fix typos

(cherry picked from commit a931cec)

# Conflicts:
#	release-notes/4.0.0.md

Author: johanrhodin

release-notes/4.0.0.md

@@ -88,9 +88,13 @@ TBD
 
 ## Source Code Archives
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 To obtain source code of the entire distribution, please download the archive named `rabbitmq-server-4.0.0-beta.1.tar.xz`
 =======
 To obtain source code of the entire distribution, please download the archive named `rabbitmq-server-3.13.4.tar.xz`
 >>>>>>> c66e5ea058 (Update 4.0.0 release notes)
+=======
+To obtain source code of the entire distribution, please download the archive named `rabbitmq-server-4.0.0-beta.1.tar.xz`
+>>>>>>> a931cec76e (fix typos)
 instead of the source tarball produced by GitHub.