Fix conflicts

Author: anavarre

install/flatpak.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 sudo apt install -y flatpak
 sudo apt install -y gnome-software-plugin-flatpak
 sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo