diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 094296b..a0d92b1 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -44,28 +44,16 @@
         <h2 class="text-secondary">{{ T "footer_download" }}</h2>
           <h3 class="text-secondary">{{ T "footer_download_phone" }}</h3>
           <ul class="list-unstyled">
-<<<<<<< HEAD
-            <li><a href="https://fdroid.selfprivacy.org/" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_fdroid" }}</a></li>
-            <li><a href="https://play.google.com/store/apps/details?id=org.selfprivacy.app" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_google_play" }}</a></li>
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_apk" }}</a></li>
-            <li><a href="#" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_ios" }}</a></li>
-          </ul>
-        <h3 class="text-secondary">{{ T "footer_download_desktop" }}</h3>
-          <ul class="list-unstyled">
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_linux" }}</a></li>
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_windows" }}</a></li>
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_macos" }}</a></li>
-=======
             <li><a href="https://fdroid.selfprivacy.org/" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-android"></i></span> {{ T "footer_download_fdroid" }}</a></li>
             <li><a href="https://play.google.com/store/apps/details?id=org.selfprivacy.app" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-solid fa-play"></i></span> {{ T "footer_download_google_play" }}</a></li>
             <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-solid fa-file"></i></span> {{ T "footer_download_apk" }}</a></li>
+            <li><a href="#" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-apple"></i></span> {{ T "footer_download_ios" }}</a></li>
           </ul>
         <h3 class="text-secondary">{{ T "footer_download_desktop" }}</h3>
           <ul class="list-unstyled">
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-windows"></i></span> {{ T "footer_download_windows" }}</a></li>
             <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-linux"></i></span> {{ T "footer_download_linux" }}</a></li>
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-apple"></i></span> {{ T "footer_download_macos" }}</a></li>
->>>>>>> 6717733 (fix: add icons to the footer dl section)
+            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-windows"></i></span> {{ T "footer_download_windows" }}</a></li>
+            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-apple"></i></span> {{ T "footer_download_macos" }}</a></li>
           </ul>
 
       </div>