diff --git a/.bash_aliases b/.bash_aliases
index d9ae315..9a623fb 100755
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -88,6 +88,7 @@ alias tootctl='docker exec -it -w /app/www mastodon bin/tootctl'
 alias hackingtool='docker run -it --net=host --security-opt seccomp=unconfined --privileged blackarchlinux/blackarch:latest'
 # Do you need to reboot? Find out here!
 alias needrs='[ -f /var/run/reboot-required ] && echo "You need to reboot"'
+<<<<<<< Updated upstream
 
 # Countdown Timer
 countdown() {
@@ -109,4 +110,21 @@ function rgcm() {
   git add .
   git commit -m "$message"
   echo "Git commit submitted with message: $message"
+=======
+function cntdn() {
+    local count=$1
+    while [ $count -gt 0 ]; do
+        echo -en "\n$count... "
+        if [ $count -eq 3 ]; then
+            echo "You've still got a few seconds to live it up before your time runs out!"
+        elif [ $count -eq 2 ]; then
+            echo "Tick-tock, tick-tock, time's running out!"
+        elif [ $count -eq 1 ]; then
+            echo "You had a good run, but it's time to face the music!"
+        fi
+        sleep 1
+        ((count--))
+    done
+    echo "Time's up!"
+>>>>>>> Stashed changes
 }