chore(global): just casual merge conflict fix btw

Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>

.config/bash/autoloader.bashrc

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC1090
 
 for file in "${HOME}"/.config/bash/tools/*.bashrc; do
   if [ "$file" == "${HOME}/.config/bash/tools/automated-deploy.bashrc" ]; then
@@ -12,4 +13,4 @@ done
 for file in "${HOME}"/.config/bash/completions/*.bash; do
   [[ $DEBUG != "" ]] && echo "[shell-completions] sourcing $file"
   source "$file"
-fi
+done

.config/bash/bashrc

@@ -72,8 +72,8 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo
 # You may want to put all your additions into a separate file like
 # ~/.bash_aliases, instead of adding them here directly.
 # See /usr/share/doc/bash-doc/examples in the bash-doc package.
-source "${HOME}/.config/bash/aliases"
-source "${HOME}/.config/bash/functions"
+source "${HOME}/.config/bash/aliases.bashrc"
+source "${HOME}/.config/bash/functions.bashrc"
 source "${HOME}/.config/bash/autoloader.bashrc"
 
 # enable programmable completion features (you don't need to enable
@@ -88,4 +88,4 @@ if ! shopt -oq posix; then
 fi
 
 [ -f "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc" ] \
-  && . "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc"
+  && . "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc"