diff --git a/arch-setup/install.sh b/arch-setup/install.sh
index 763d0075..dc1beb92 100755
--- a/arch-setup/install.sh
+++ b/arch-setup/install.sh
@@ -565,7 +565,6 @@ else
     echo "Skipping Element"
 fi
 '
->>>>>>> master
 
 #performance and battery life
 if [ $in_acpufreq -eq 1 ]; then