diff --git a/docs/index.html b/docs/index.html
index c41f9532..5f0bd353 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -118,31 +118,19 @@
     	</script>
         <div class="row text-center">
             <div class="col">
-<<<<<<< Updated upstream
-                <a id="download_windows" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.17.1/ctbrec-1.17.1-win64-jre.zip');">
-=======
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-win64-jre.zip');">
->>>>>>> Stashed changes
+                <a id="download_windows" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-win64-jre.zip');">
                     <i class="fa fa-windows mr-2"></i>
                     Download for Windows!
                 </a>
             </div>
             <div class="col">
-<<<<<<< Updated upstream
-                <a id="download_macos" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.17.1/ctbrec-1.17.1-macos-jre.zip');">
-=======
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-macos-jre.zip');">
->>>>>>> Stashed changes
+                <a id="download_macos" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-macos-jre.zip');">
                     <i class="fa fa-apple mr-2"></i>
                     Download for macOS!
                 </a>
             </div>
             <div class="col">
-<<<<<<< Updated upstream
-                <a id="download_linux" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.17.1/ctbrec-1.17.1-linux-jre.zip');">
-=======
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-linux-jre.zip');">
->>>>>>> Stashed changes
+                <a id="download_linux" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-linux-jre.zip');">
                     <i class="fa fa-linux mr-2"></i>
                     Download for Linux!
                 </a>