diff --git a/.bash_aliases b/.bash_aliases
index f1fb489..ac1db2f 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -4,4 +4,8 @@ alias mountns="sudo mount -t nfs manjarodesktop:/mnt/TerraBeef/NetShare /mnt/man
 alias sshcloud="ssh -p 1919 emge@95.217.8.112"
 alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
 alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/"
+<<<<<<< Updated upstream
 alias s!="sudo systemctl"
+=======
+alias portcheck="sudo lsof -i -P -n | grep LISTEN"
+>>>>>>> Stashed changes
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 88f1009..f1e961b 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -15,3 +15,5 @@ starship init fish | source
 source ~/.bash_aliases
 
 set -gx EDITOR nvim
+
+set -gx DATABASE_URL user=miniflux password=Z5l3KVoEXY dbname=miniflux sslmode=disable