fix merge conflicts

.gitlab-ci.yml

@@ -3,12 +3,12 @@ stages:
   - build
   - release
 
+# Notes; we want short labes so we can see what is what, and
+# allow image builds on all branches because don't wan to
+# deal with them on the master branch
 Images:
   stage: images
   when: manual
-  only:
-    - master
-    - flatpak-appimage
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags: [autoscale]
   parallel: