diff --git a/ac.sh b/ac.sh
index f3a2792..b633f9c 100755
--- a/ac.sh
+++ b/ac.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-xrandr --output eDP --mode 1920x1080 --rate 120
 echo 1 | sudo tee /sys/devices/system/cpu/cpu8/online
 echo 1 | sudo tee /sys/devices/system/cpu/cpu9/online
 echo 1 | sudo tee /sys/devices/system/cpu/cpu10/online
@@ -9,11 +8,5 @@ echo 1 | sudo tee /sys/devices/system/cpu/cpu12/online
 echo 1 | sudo tee /sys/devices/system/cpu/cpu13/online
 echo 1 | sudo tee /sys/devices/system/cpu/cpu14/online
 echo 1 | sudo tee /sys/devices/system/cpu/cpu15/online
-<<<<<<< HEAD
 sudo systemctl restart auto-cpufreq
-=======
-
->>>>>>> 4dbc103e37ed3440d42370c1b3251d5ee6faf3e4
-sleep 0.5 
-#sudo tlp start
-asusctl profile normal
+xrandr --output eDP --mode 1920x1080 --rate 120
diff --git a/battery.sh b/battery.sh
index 74ec51f..14e9848 100755
--- a/battery.sh
+++ b/battery.sh
@@ -11,10 +11,4 @@ echo 0 | sudo tee /sys/devices/system/cpu/cpu15/online
 xrandr --output eDP --mode 1920x1080 --rate 60
 #sudo ryzenadj --max-gfxclk=800 --stapm-limit=5000
 #sudo tlp start
-#sudo sh -c 'echo "\\_SB.PCI0.GPP0.PG00._OFF" > /proc/acpi/call'
-#./gpuoff.sh
-#sleep 0.5; echo "ON" | sudo tee /proc/acpi/bbswitch; sleep 1; echo "OFF" | sudo tee /proc/acpi/bbswitch
-<<<<<<< HEAD
 sudo systemctl restart auto-cpufreq
-=======
->>>>>>> 4dbc103e37ed3440d42370c1b3251d5ee6faf3e4