diff --git a/autostart.sh b/autostart.sh
index abb0a2e..7f4db8d 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -3,7 +3,11 @@
 export DISPLAY=:0
 
 #Added some programs here since emptty had issues
+<<<<<<< HEAD
 polybar-restart &
+=======
+polybar &
+>>>>>>> 87ac7b206297330f25c4ce049614d23647387d46
 
 # --- Music Workspace Start ---
 #Note: So alacritty specifically (I believe kitty fixed this) has a scaling issue because L/R monitor diff resolutions
@@ -29,7 +33,11 @@ xset dpms 300 &
 xautolock -locker "slock" -nowlocker "slock -f" -time 5 &
 picom --experimental-backends -b &
 feh --bg-fill $(/public/wallpapers/mon1.cfg) --bg-fill $(/public/wallpapers/mon2.cfg) &
+<<<<<<< HEAD
 # /usr/local/bin/trayer-restart # Launch from polybar-restart launcher now
+=======
+trayer --edge bottom --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x555E70 --height 22 &
+>>>>>>> 87ac7b206297330f25c4ce049614d23647387d46
 conky -q -c /home/allen/.config/conky-0.conf &
 conky -q -c /home/allen/.config/conky-1.conf &
 mpDris2 &
diff --git a/paru-update-all b/paru-update-all
index e18ffd5..0e6cd34 100755
--- a/paru-update-all
+++ b/paru-update-all
@@ -14,6 +14,15 @@ echo ''
 echo -e $GREEN"================================================================="
 echo -e "UPDATE COMPLETED!\n"$NC
 
+<<<<<<< HEAD
+=======
+read -p "Do you want to recompile xmonad? (y/N): " -i "y" XMONAD_UPDATE
+
+if [ "$XMONAD_UPDATE" == "y" ]; then
+  xmonad --recompile
+fi
+
+>>>>>>> 87ac7b206297330f25c4ce049614d23647387d46
 echo $(cat /etc/pacman.conf | grep "IgnorePkg   =")
 read -p "DO YOU WANT TO UPDATE DANGEROUS PACKAGES TOO? 
 RECOMMENDED EVERY 3 MONTHS (y/N): " -i "y" USER_AGREEMENT
@@ -22,10 +31,13 @@ if [ "$USER_AGREEMENT" == "y" ]; then
   sed '/^IgnorePkg/d' /etc/pacman.conf > /tmp/432143214 | paru -Syu --config /tmp/432143214; rm /tmp/432143214 
 fi
 
+<<<<<<< HEAD
 read -p "Do you want to recompile xmonad? (y/N): " -i "y" XMONAD_UPDATE
 
 if [ "$XMONAD_UPDATE" == "y" ]; then
   xmonad --recompile
 fi
 
+=======
+>>>>>>> 87ac7b206297330f25c4ce049614d23647387d46
 echo -e "\nUPDATE COMPLETED!"$NC
diff --git a/polybar-restart b/polybar-restart
index 33af6bc..f2b0659 100755
--- a/polybar-restart
+++ b/polybar-restart
@@ -1,3 +1,7 @@
 #!/bin/bash
 killall polybar > /dev/null 2>&1
+<<<<<<< HEAD
 nohup /usr/local/bin/polybar-launcher.sh > /dev/null 2>&1 &
+=======
+nohup polybar > /dev/null 2>&1 &
+>>>>>>> 87ac7b206297330f25c4ce049614d23647387d46
diff --git a/reinstall-grub b/reinstall-grub
index 0821e37..10746c2 100755
--- a/reinstall-grub
+++ b/reinstall-grub
@@ -1,6 +1,11 @@
 #!/bin/bash
 echo "Run the following commands:"
 echo
+<<<<<<< HEAD
 echo "0. Make sure you have the proper drive and EFI partition mounted under /boot/efi (Ex: sudo mount /dev/sda1 /boot/efi)"
 echo "1. sudo grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=GRUB"
+=======
+echo "0. Make sure you have the proper drive and EFI partition mounted under /efi (Ex: sudo mount /dev/sda1 /efi)"
+echo "1. sudo grub-install --target=x86_64-efi --efi-directory=/efi/ --bootloader-id=GRUB"
+>>>>>>> 87ac7b206297330f25c4ce049614d23647387d46
 echo "2. sudo grub-mkconfig -o /boot/grub/grub.cfg"