diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3b7b0f..aeed582 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,13 +86,16 @@ win:package:
       7zr e NsProcess.zip -y -o/usr/share/nsis/Include/ Include/nsProcess.nsh
       7zr e NsProcess.zip -y -o/usr/share/nsis/Plugins/x86-unicode/ Plugin/nsProcessW.dll
       mv /usr/share/nsis/Plugins/x86-unicode/nsProcessW.dll /usr/share/nsis/Plugins/x86-unicode/nsProcess.dll
+<<<<<<< HEAD
       curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
+=======
+      echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
+>>>>>>> b4268a9 (cleanup)
   script:
     - |
       # Making our Windows packages 
-      echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
       test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
-      echo -e "\e[0Ksection_start:`date +%s`:native_build\r\e[0KBuilding native packages"
+      echo -e "\e[0Ksection_start:`date +%s`:native_build[collapsed=true]\r\e[0KBuilding native packages"
       npm install --prefer-offline
       npm run dist-win
       for dir in dist/*-win-* ; do
@@ -149,7 +152,7 @@ linux:package:
     - |
       # Making our distro agnostic Linux packages
       test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
-      echo -e "\e[0Ksection_start:`date +%s`:native_build\r\e[0KBuilding native packages"
+      echo -e "\e[0Ksection_start:`date +%s`:native_build[collapsed=true]\r\e[0KBuilding native packages"
       npm install --prefer-offline
       npm run dist-nix
       chmod 755 dist/*-linux-*/GridTracker dist/*-linux-*/lib dist/*-linux-*/locales dist/*-linux-*/swiftshader/ dist/*-linux-*/chrome_crashpad_handler
@@ -163,13 +166,13 @@ linux:package:
       (cd dist; mv *.tar.gz ../artifacts/)
       echo -e "\e[0Ksection_end:`date +%s`:native_build\e[0K"
       # This section does debian DEBs
-      echo -e "\e[0Ksection_start:`date +%s`:debian_build\r\e[0KBuilding Debian packages"
+      echo -e "\e[0Ksection_start:`date +%s`:debian_build[collapsed=true]\r\e[0KBuilding Debian packages"
       dpkg-buildpackage -b --no-sign
       mv ../*.{deb,buildinfo,changes} artifacts/
       echo -e "\e[0Ksection_end:`date +%s`:debian_build\r\e[0K"
       echo -e "\e[0Ksection_start:`date +%s`:flatpaks\e[0KBuilding Flatpak"
       flatpak-builder flatpak flatpak_x64_manifest.yml --force-clean --repo=flatpakrepo
-      flatpak build-bundle flatpakrepo gridtracker-$version-x86_64.flatpak org.gridtracker.GridTracker
+      flatpak build-bundle flatpakrepo GridTracker-$version-x86_64.flatpak org.gridtracker.GridTracker
       mv *.flatpak artifacts/
       echo -e "\e[0Ksection_end:`date +%s`:flatpaks\r\e[0K"
       echo "we made LINUX packages!"
@@ -296,17 +299,17 @@ arm:package:
       mv GridTracker-$version-linux-arm64.tar.gz artifacts/
       echo "GridTracker-$version-linux-arm32.tar.gz built."
       rm -rf nwjs-$NWJS-VERSION-linux-arm64
+      # This is for ARM 64 Flatpaks
       echo -e "\e[0Ksection_start:`date +%s`:flatpaks[collapsed=true]\r\e[0KBuilding Flatpak"
       echo "Creating workdir..."
       mkdir -p dist
       echo "Copying GridTracker-$version-linux-arm64 to workdir..."
       mv GridTracker-$version-linux-arm64 dist/
       cp dist/GridTracker-$version-linux-arm64/package.nw/gridview.png dist/GridTracker-$version-linux-arm64/gridview.png
-      ls -la dist/GridTracker-$version-linux-arm64
       echo "Building flatpak source..."
       flatpak-builder flatpak flatpak_arm64_manifest.yml --force-clean --repo=flatpakrepo
       echo "Exporting single-file flatpak..."
-      flatpak build-bundle flatpakrepo gridtracker-$version-arm64.flatpak org.gridtracker.GridTracker
+      flatpak build-bundle flatpakrepo GridTracker-$version-arm64.flatpak org.gridtracker.GridTracker
       mv *.flatpak artifacts/
       echo -e "\e[0Ksection_end:`date +%s`:flatpaks\r\e[0K"
       echo "we made ARM packages!"