Fix zsync link

source/1/1.1/retrieving_the_image.rst

@@ -39,17 +39,11 @@ To verify the image, run this from the command line:
 
 .. code:: 
 
-<<<<<<< HEAD
-
- sha256sum lubuntu-20.10-desktop-amd64.iso
-=======
  sha256sum lubuntu-21.04-desktop-amd64.iso
->>>>>>> master
 
 and then carefully check that the output matches 
 7089fa1045b776256a76adb30d6e588e09df2ad5cd0ffe63a8d6e802b6b3cc19 \*lubuntu-21.04-desktop-amd64.iso
 
-
 Downloading the image via BitTorrent
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Instead of downloading the image from one server, you can "torrent" the image, or download it from multiple sources instead of just one. This is often faster and saves the bandwidth of the Ubuntu cdimage servers. If you would like to learn more about BitTorrent, take a look at `the Wikipedia page on the subject <https://en.wikipedia.org/wiki/BitTorrent>`_.
@@ -83,10 +77,6 @@ To download the image using zsync run
  
 .. code::
 
-<<<<<<< HEAD
+   zsync http://cdimage.ubuntu.com/lubuntu/releases/hirsute/release/lubuntu-21.04-desktop-amd64.iso.zsync
-   zsync http://cdimage.ubuntu.com/lubuntu/releases/focal/release/lubuntu-20.04-desktop-amd64.iso.zsync  
-=======
-   zsync http://cdimage.ubuntu.com/lubuntu/releases/groovy/release/lubuntu-20.10-desktop-amd64.iso.zsync  
->>>>>>> master
 
 **You have now downloaded the image successfully. Please continue to Chapter 1.2.**