diff --git a/.bash_aliases b/.bash_aliases
index 9a623fb..19e71fe 100755
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -88,7 +88,6 @@ 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() {
@@ -110,7 +109,6 @@ 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
@@ -126,5 +124,4 @@ function cntdn() {
         ((count--))
     done
     echo "Time's up!"
->>>>>>> Stashed changes
 }